From e318c414fd5194e9de9277398646961c5379787e Mon Sep 17 00:00:00 2001
From: silencer-pl <103842328+silencer-pl@users.noreply.github.com>
Date: Tue, 28 May 2024 06:28:41 -0400
Subject: [PATCH] Persistency - clothing saving and loading
funny object in container moment, hat to derive location for coords.
---
.../items/sectorpatrol/crafting_items.dm | 1 +
.../crafting/crafting_structures.dm | 1 +
code/modules/admin/verbs/sectorpatrol.dm | 27 +++----
code/modules/clothing/head/head_sp.dm | 1 +
code/modules/clothing/shoes/shoes_sp.dm | 1 +
code/modules/clothing/socks/socks.dm | 1 +
code/modules/clothing/suits/civilian_sp.dm | 1 +
code/modules/clothing/under/under_sp.dm | 1 +
.../SectorPatrol/OuterVeilPST/ovpst.dmm | 73 ++++++++++---------
9 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/code/game/objects/items/sectorpatrol/crafting_items.dm b/code/game/objects/items/sectorpatrol/crafting_items.dm
index c57de964cd..6b1a1c45b1 100644
--- a/code/game/objects/items/sectorpatrol/crafting_items.dm
+++ b/code/game/objects/items/sectorpatrol/crafting_items.dm
@@ -15,6 +15,7 @@
icon_state = "default"
desc = "Brown packaging in the shape of a box. If just looked at, seems like cardboard, but when touched, one would see that it seems way more rigid and seems to be in fact some sort of resin. Seems like it would be easy to break open, but the process would clearly be one way. A label is visible on one of its corners."
desc_lore = "The Northern Republic Production Standard not only dictates screw hole sizes and tube lengths, but also regulates both packaging and labeling of anything adhering to the standard when it is produced. Essentially this means that every NRPS standard complaint wrapping is made of the same brownish artificial resin, meant to be a combination of cardboard and Styrofoam, and always comes with a label oriented towards the bottom-right hand corner of the package. Essentially this means that if you can read the letters, the package is likely upright."
+ PersistantObject = TRUE
/obj/item/crafting/packages/chair
icon_state = "package_l"
diff --git a/code/game/objects/structures/sectorpatrol/crafting/crafting_structures.dm b/code/game/objects/structures/sectorpatrol/crafting/crafting_structures.dm
index 76895d6615..3a60d9b7c2 100644
--- a/code/game/objects/structures/sectorpatrol/crafting/crafting_structures.dm
+++ b/code/game/objects/structures/sectorpatrol/crafting/crafting_structures.dm
@@ -17,6 +17,7 @@
desc_lore = "The Northern Republic Production Standard not only dictates screw hole sizes and tube lengths, but also regulates both packaging and labeling of anything adhering to the standard when it is produced. Essentially this means that every NRPS standard complaint wrapping is made of the same brownish artificial resin, meant to be a combination of cardboard and Styrofoam, and always comes with a label oriented towards the bottom-right hand corner of the package. Essentially this means that if you can read the letters, the package is likely upright."
opacity = FALSE
density = TRUE
+ PersistantObject = TRUE
/obj/structure/crafting/packages/table
icon_state = "package_xl"
diff --git a/code/modules/admin/verbs/sectorpatrol.dm b/code/modules/admin/verbs/sectorpatrol.dm
index 5f672a4fcf..b7ea67f493 100644
--- a/code/modules/admin/verbs/sectorpatrol.dm
+++ b/code/modules/admin/verbs/sectorpatrol.dm
@@ -88,7 +88,7 @@
sleep(5)
GLOB.savefile_number += 1
//Savefile number reference
- var/savefile/G = new("data/persistance/globals.sav")
+ var/savefile/G = new("data/persistance/turf_obj_globals.sav")
G["current_save"] << GLOB.savefile_number
//Turfs
to_chat(world, SPAN_BOLDWARNING("Saving modular turf data..."))
@@ -110,16 +110,17 @@
var/item_index = 0
for(var/obj/obj in GLOB.objects_saved)
item_index += 1
+ var/turf/groundloc = get_turf(obj)
I.cd = "/[item_index]"
I["objtype"] << obj.type
I["name"] << obj.name
I["desc"] << obj.desc
I["desc_lore"] << obj.desc_lore
- I["x"] << obj.x
+ I["x"] << groundloc.x
I["pixel_x"] << obj.pixel_x
- I["y"] << obj.y
+ I["y"] << groundloc.y
I["pixel_y"] << obj.pixel_y
- I["z"] << obj.z
+ I["z"] << groundloc.z
I["customizable"] << obj.customizable
I["customizable_desc"] << obj.customizable_desc
I["customizable_desc_lore"] << obj.customizable_desc_lore
@@ -139,7 +140,7 @@
to_chat(world, SPAN_BOLDWARNING("Performing persistant data load. The game may stop responidng..."))
sleep(5)
- var/savefile/G = new("data/persistance/globals.sav")
+ var/savefile/G = new("data/persistance/turf_obj_globals.sav")
G["current_save"] >> GLOB.savefile_number
to_chat(world, SPAN_BOLDWARNING("Loading turfs..."))
var/savefile/S = new("data/persistance/turf_ovpst_[GLOB.savefile_number].sav")
@@ -172,14 +173,14 @@
I["y"] >> item_y
I["z"] >> item_z
var/obj/newitem = new item_type(locate(item_x, item_y, item_z))
- I["name"] << newitem.name
- I["desc"] << newitem.desc
- I["desc_lore"] << newitem.desc_lore
- I["pixel_x"] << newitem.pixel_x
- I["pixel_y"] << newitem.pixel_y
- I["customizable"] << newitem.customizable
- I["customizable_desc"] << newitem.customizable_desc
- I["customizable_desc_lore"] << newitem.customizable_desc_lore
+ I["name"] >> newitem.name
+ I["desc"] >> newitem.desc
+ I["desc_lore"] >> newitem.desc_lore
+ I["pixel_x"] >> newitem.pixel_x
+ I["pixel_y"] >> newitem.pixel_y
+ I["customizable"] >> newitem.customizable
+ I["customizable_desc"] >> newitem.customizable_desc
+ I["customizable_desc_lore"] >> newitem.customizable_desc_lore
newitem.update_icon()
newitem.update_custom_descriptions()
to_chat(world, SPAN_BOLDWARNING("Object data loaded."))
diff --git a/code/modules/clothing/head/head_sp.dm b/code/modules/clothing/head/head_sp.dm
index b9f833029b..2e7a2ffc63 100644
--- a/code/modules/clothing/head/head_sp.dm
+++ b/code/modules/clothing/head/head_sp.dm
@@ -129,6 +129,7 @@
var/flippable
var/flippable_flipped
var/flippable_returns
+ PersistantObject = TRUE
//flippable caps, add icon with _flipped to both sets
diff --git a/code/modules/clothing/shoes/shoes_sp.dm b/code/modules/clothing/shoes/shoes_sp.dm
index 14b618d09c..a28b46fd5e 100644
--- a/code/modules/clothing/shoes/shoes_sp.dm
+++ b/code/modules/clothing/shoes/shoes_sp.dm
@@ -10,6 +10,7 @@
item_icons = list(
WEAR_FEET = 'icons/obj/sp_clothes/shoes/onmob/shoes.dmi'
)
+ PersistantObject = TRUE
///obj/item/clothing/shoes/sp_personal/baseshoe/marine
// name = "marine boots"
diff --git a/code/modules/clothing/socks/socks.dm b/code/modules/clothing/socks/socks.dm
index 7889d82ae8..5b88ada1db 100644
--- a/code/modules/clothing/socks/socks.dm
+++ b/code/modules/clothing/socks/socks.dm
@@ -24,6 +24,7 @@
WEAR_SOCKS = 'icons/obj/sp_clothes/socks/onmob/socks.dmi'
)
layer = SOCKS_LAYER
+ PersistantObject = TRUE
/obj/item/clothing/socks/update_clothing_icon()
if(ismob(loc))
diff --git a/code/modules/clothing/suits/civilian_sp.dm b/code/modules/clothing/suits/civilian_sp.dm
index 0d683ed588..24ce099844 100644
--- a/code/modules/clothing/suits/civilian_sp.dm
+++ b/code/modules/clothing/suits/civilian_sp.dm
@@ -12,6 +12,7 @@
)
var/openable
var/openable_open
+ PersistantObject = TRUE
/obj/item/clothing/suit/sp_personal/verb/open_jacket()
diff --git a/code/modules/clothing/under/under_sp.dm b/code/modules/clothing/under/under_sp.dm
index 14f5b1f972..705ed0ffbe 100644
--- a/code/modules/clothing/under/under_sp.dm
+++ b/code/modules/clothing/under/under_sp.dm
@@ -12,6 +12,7 @@
)
var/openable
var/openable_open
+ PersistantObject = TRUE
// Objects with rollable sleeves
diff --git a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm
index 1b508ddc2f..b067b39835 100644
--- a/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm
+++ b/maps/map_files/SectorPatrol/OuterVeilPST/ovpst.dmm
@@ -55,7 +55,7 @@
"fa" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "e-d31"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_d31)
"ff" = (/obj/structure/machinery/light,/turf/open/floor/almayer{dir = 1; icon_state = "red"},/area/ovpst)
"fk" = (/obj/structure/bed/chair/modular/office{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
-"fp" = (/obj/effect/decal/info_tag/pst/drm{dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- DRM -
Dorms, Deck 37, Sector B"},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{dir = 8; icon_state = "greencorner"},/area/ovpst)
+"fp" = (/obj/effect/decal/info_tag/pst/drm{dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- DRM -
Dorms, Deck 37, Sector B"},/turf/open/floor/almayer{dir = 8; icon_state = "greencorner"},/area/ovpst)
"fs" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/plating/modular,/area/ovpst)
"fv" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"fA" = (/obj/effect/decal/info_tag/pst/ele{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/obj/effect/step_trigger/message/seeonce_blurb/Pinnacle,/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst)
@@ -100,7 +100,7 @@
"it" = (/obj/effect/decal/info_tag/pst/eld{pixel_y = 0; dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/turf/open/floor/almayer{dir = 8; icon_state = "emeraldcorner"},/area/ovpst)
"iz" = (/obj/structure/machinery/light/small{dir = 8; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "black"; dir = 1},/area/ovpst)
"iD" = (/obj/structure/machinery/cm_vending/sorted/sectorpatrol/cigrette{density = 0; pixel_y = 20},/turf/open/floor/almayer,/area/ovpst)
-"iG" = (/obj/effect/decal/info_tag/pst/san{desc = "UACM Outer Veil Primary Supply Terminal
- SAN - Deck 37 Dorm Toilets
"; pixel_x = -16; pixel_y = 16},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst)
+"iG" = (/obj/effect/decal/info_tag/pst/san{desc = "UACM Outer Veil Primary Supply Terminal
- SAN - Deck 37 Dorm Toilets
"; pixel_x = -16; pixel_y = 16},/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst)
"iI" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst)
"iJ" = (/turf/open/floor/plating/modular/gray{tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
"iN" = (/obj/structure/machinery/light/small,/turf/open/floor/plating/modular,/area/ovpst)
@@ -110,7 +110,7 @@
"je" = (/obj/effect/decal/cargo_stripes{icon_state = "nes"},/turf/open/floor/almayer{dir = 9; icon_state = "red"},/area/ovpst)
"jg" = (/obj/structure/machinery/cm_vending/clothing/super_snowflake/sp_civclothes,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"ji" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/security_generic{dir = 1},/turf/open/floor/almayer{icon_state = "redfull"},/area/ovpst)
-"jk" = (/obj/structure/surface/modular/table,/turf/open/floor/plating/modular/gray{tile_top_left = "orange"; tile_bot_rght = "blue"},/area/ovpst)
+"jk" = (/obj/structure/surface/modular/table,/obj/item/device/modular/lamp,/turf/open/floor/plating/modular/gray{tile_top_left = "orange"; tile_bot_rght = "blue"},/area/ovpst)
"jl" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 8},/area/ovpst)
"jo" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"jq" = (/obj/structure/machinery/door/poddoor/shutters/almayer{id = "scn1_shutter"},/obj/structure/window/framed/almayer,/turf/open/floor/plating,/area/ovpst)
@@ -142,12 +142,13 @@
"ls" = (/obj/structure/bed/chair/modular/office{dir = 1},/turf/open/floor/plating/modular/gray{tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "navyblue"; tile_top_rght = "navyblue"},/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/surface/table/reinforced/black,/obj/structure/eventterminal/civnet{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
+"lA" = (/obj/structure/closet/modular/drawers,/turf/open/floor/plating/modular/gray{tile_bot_left = "blue"; tile_bot_rght = "blue"; tile_top_left = "blue"; tile_top_rght = "blue"},/area/ovpst)
"lB" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/2x1almayerdoor.dmi'; id = "crypt_airlock_doors"; locked = 1},/obj/structure/machinery/door/poddoor/almayer/locked{id = "crypt-c"},/turf/open/floor/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst)
"lF" = (/turf/open/floor/almayer{dir = 1; icon_state = "orange"},/area/ovpst)
"lL" = (/turf/open/floor/plating/almayer{icon_state = "purple-white"; dir = 4},/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/ovpst)
-"lT" = (/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{icon_state = "red"},/area/ovpst)
+"lT" = (/obj/structure/bed/chair/modular/office,/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "black"},/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)
"mb" = (/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "bloodred"; tile_bot_rght = "bloodred"; tile_top_left = "bloodred"; tile_top_rght = "black"},/area/ovpst)
"me" = (/obj/structure/machinery/cm_vending/sorted/sectorpatrol/food{density = 0; pixel_y = 20},/turf/open/floor/almayer,/area/ovpst)
@@ -169,7 +170,7 @@
"nh" = (/obj/structure/machinery/door/poddoor/railing{dir = 2; id = "d31_cargo_fence"},/obj/effect/decal/cargo_stripes{icon_state = "n"},/turf/open/floor/almayer{icon_state = "sterile"},/area/ovpst)
"nk" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/structure/bed/chair/comfy/black{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"nz" = (/obj/effect/step_trigger/message/seeonce_blurb/Pinnacle,/turf/open/floor/almayer{dir = 9; icon_state = "emerald"},/area/ovpst)
-"nC" = (/obj/structure/machinery/light{dir = 1; brightness = 12},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst)
+"nC" = (/obj/structure/machinery/light{dir = 1; brightness = 12},/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst)
"nE" = (/obj/structure/machinery/conveyor{id = "d31-entrance"; drag_delay = 1; dir = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"nG" = (/obj/structure/machinery/light,/turf/open/floor/almayer{icon_state = "red"},/area/ovpst)
"nO" = (/obj/effect/decal/info_tag/pst/san{desc = "UACM Outer Veil Primary Supply Terminal
- SAN - Deck 37 Showers
"; dir = 4; pixel_y = 16},/turf/open/floor/almayer{icon_state = "black"; dir = 9},/area/ovpst)
@@ -218,7 +219,7 @@
"qZ" = (/obj/effect/decal/info_tag/pst/eng{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dorms Deck 37, Sector A, Maintenance Shaft"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. These areas typically require an elevated engineering clearance. These doors lead to maintenance shafts used to service issues with the dorms should ones arrive. Some of these passages may have other exits, but since no centralized map system exists for the PST, finding those is a matter of luck. "},/turf/open/floor/almayer{icon_state = "orange-silver"; dir = 1},/area/ovpst)
"rf" = (/obj/structure/machinery/conveyor{dir = 6; id = "d31-entrance"; drag_delay = 1},/obj/structure/plasticflaps,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"rj" = (/obj/docking_port/stationary/emergency_response/external/pst_elevator_e_pinnacle,/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_e_pin)
-"rv" = (/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer,/area/ovpst)
+"rv" = (/obj/structure/surface/modular/table,/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
"rB" = (/turf/open/floor/almayer/empty,/area/ovpst/airlock/ele_d_drm)
"rC" = (/obj/structure/machinery/light{dir = 4; brightness = 14},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"rI" = (/obj/structure/bed/sofa/south/grey/left,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
@@ -238,7 +239,7 @@
"sM" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin/elevator_outer{id = "e-pin"},/turf/open/floor/almayer{icon_state = "plating"; dir = 1},/area/ovpst/airlock/ele_e_pin)
"sT" = (/obj/structure/machinery/light/small,/obj/item/crafting/packages/chair,/turf/open/floor/plating/modular,/area/ovpst)
"sV" = (/turf/open/floor/almayer/empty,/area/ovpst)
-"te" = (/obj/structure/machinery/light{brightness = 12},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{dir = 8; icon_state = "redcorner"},/area/ovpst)
+"te" = (/obj/structure/machinery/light{brightness = 12},/turf/open/floor/almayer{dir = 8; icon_state = "redcorner"},/area/ovpst)
"th" = (/obj/effect/decal/info_tag/pst/ele{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-E -
Primary Access Elevator - E"},/obj/structure/machinery/light{dir = 1},/obj/effect/step_trigger/message/seeonce_blurb/Dock31,/turf/open/floor/almayer{dir = 1; icon_state = "emeraldcorner"},/area/ovpst)
"ti" = (/turf/open/floor/plating/modular/gray{tile_bot_left = "navyblue"; tile_bot_rght = "bloodred"; tile_top_left = "navyblue"; tile_top_rght = "navyblue"},/area/ovpst)
"to" = (/obj/structure/machinery/light/small{dir = 1; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst)
@@ -291,6 +292,7 @@
"xS" = (/obj/structure/ladder{id = "hd_sw_1"; icon_state = "ladder10"; height = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"xV" = (/turf/open/floor/plating/modular/gray{tile_bot_left = "dustyblue"; tile_bot_rght = "dustyblue"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
"yb" = (/obj/structure/prop/almayer/ship_memorial,/turf/open/floor/holofloor/grass,/area/ovpst)
+"yc" = (/turf/open/floor/almayer{dir = 1; icon_state = "silver"},/area/ovpst)
"yg" = (/turf/open/floor/almayer{dir = 5; icon_state = "emerald"},/area/ovpst)
"yk" = (/turf/open/floor/almayer{icon_state = "redfull"; dir = 4},/area/ovpst)
"yn" = (/obj/structure/ladder{id = "hd_nw_2"; icon_state = "ladder10"; height = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
@@ -321,7 +323,7 @@
"Ap" = (/turf/open/floor/plating/modular/gray{tile_top_left = "blue"; tile_bot_rght = "orange"},/area/ovpst)
"Aq" = (/turf/open/floor/almayer{dir = 4; icon_state = "bluecorner"},/area/ovpst)
"AA" = (/obj/structure/machinery/conveyor{id = "d31-entrance"; drag_delay = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
-"AE" = (/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
+"AE" = (/obj/structure/closet/modular/drawers,/turf/open/floor/plating/modular{tile_bot_left = "bloodred"; tile_bot_rght = "bloodred"; tile_top_left = "bloodred"; tile_top_rght = "bloodred"; tile_seal = "black"},/area/ovpst)
"AI" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{icon_state = "blackcorner"; dir = 4},/area/ovpst)
"AJ" = (/obj/structure/machinery/door/airlock/almayer/uacm/ovpst/general{icon = 'icons/obj/structures/doors/securedoor.dmi'},/turf/open/floor/almayer{icon_state = "bluefull"},/area/ovpst)
"AM" = (/turf/open/floor/almayer/uscm/directional{dir = 9; icon_state = "logo_directional1"},/area/ovpst)
@@ -336,10 +338,11 @@
"BF" = (/obj/effect/decal/info_tag/pst/sec{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- SEC - D01 - R37 -
Dorms Deck 37 Entrance Guest Clearance and Cargo Reception Station"},/obj/structure/machinery/light{dir = 4; brightness = 12},/turf/open/floor/almayer{dir = 4; icon_state = "redcorner"},/area/ovpst)
"BH" = (/obj/structure/machinery/light/small{dir = 8; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31)
"BI" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{dir = 4; icon_state = "emeraldcorner"},/area/ovpst)
+"BL" = (/obj/structure/surface/modular/table,/turf/open/floor/plating/modular{tile_bot_left = "eclipsebrown"; tile_bot_rght = "eclipsebrown"; tile_top_left = "eclipsebrown"; tile_top_rght = "eclipsebrown"; tile_seal = "black"},/area/ovpst)
"BR" = (/obj/structure/bed/chair/comfy/black,/obj/effect/decal/info_tag/pst/eld{dir = 8; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst)
"BU" = (/obj/structure/toilet{dir = 4; pixel_x = -1},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst)
"BV" = (/obj/effect/decal/info_tag/pst/ofc{dir = 8; pixel_x = -16; desc_lore = "The label OFC indicates office areas, which as the name suggests are typically areas with some specific, bureaucratic function assigned to them and can be anything from personal offices of high-ranking personnel to teaching rooms and spare, unused generic spaces. This door leads to one of the orientation offices, used to brief and greet new arrivals to the station."; desc = "UACM Outer Veil Primary Supply Terminal
- OFC -
Entrance Orientation Office"},/turf/open/floor/almayer{dir = 8; icon_state = "silvercorner"},/area/ovpst)
-"BX" = (/obj/effect/decal/info_tag/pst/rec{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- REC -
Dorm Recreational and Social Areas"; desc_lore = "The label REC indicates recreational areas, which often include public CivNet access points but can essentially be any area dedicated to down time or recreation on the station, including cafeterias and kitchens.Each dorm level on the PST has a communal area like the one this door leads to, that has a kitchen, cafeteria that peeks out into its lobby and room for several other recreational facilities that tend to be customized to the dorm's inhabitants' specific needs."},/obj/structure/machinery/light{dir = 1; brightness = 12},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst)
+"BX" = (/obj/effect/decal/info_tag/pst/rec{pixel_x = -16; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- REC -
Dorm Recreational and Social Areas"; desc_lore = "The label REC indicates recreational areas, which often include public CivNet access points but can essentially be any area dedicated to down time or recreation on the station, including cafeterias and kitchens.Each dorm level on the PST has a communal area like the one this door leads to, that has a kitchen, cafeteria that peeks out into its lobby and room for several other recreational facilities that tend to be customized to the dorm's inhabitants' specific needs."},/obj/structure/machinery/light{dir = 1; brightness = 12},/turf/open/floor/almayer{icon_state = "silvercorner"; dir = 1},/area/ovpst)
"BZ" = (/obj/structure/toilet{pixel_y = 10},/obj/structure/machinery/light/small{dir = 4},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst)
"Ca" = (/obj/structure/machinery/light,/turf/open/floor/almayer{dir = 8; icon_state = "orangecorner"},/area/ovpst)
"Cg" = (/obj/effect/decal/info_tag/pst/eng{dir = 2; pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dorms Deck 37, Sector B, 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{dir = 6; icon_state = "orange-green"},/area/ovpst)
@@ -359,16 +362,16 @@
"De" = (/obj/structure/machinery/light{dir = 4; brightness = 14},/turf/open/floor/almayer{icon_state = "black"; dir = 8},/area/ovpst)
"Du" = (/obj/structure/machinery/conveyor{dir = 8; id = "d31-entrance"; drag_delay = 1; backwards = SOUTH; forwards = WEST},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Dx" = (/turf/open/floor/almayer{icon_state = "black"; dir = 5},/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."},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{icon_state = "red"},/area/ovpst)
-"DL" = (/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{icon_state = "bluecorner"},/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)
+"DL" = (/obj/structure/bed/modular,/turf/open/floor/plating/modular/gray{tile_bot_left = "blue"; tile_bot_rght = "blue"; tile_top_left = "blue"; tile_top_rght = "blue"},/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)
"DO" = (/turf/open/floor/almayer{icon_state = "black"; dir = 6},/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/ladder{id = "hd_ne_1"; icon_state = "ladder10"; height = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Ea" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst)
"Eb" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{icon = 'icons/obj/structures/doors/2x1almayerdoor_glass.dmi'},/turf/open/floor/plating/almayer{icon_state = "orangefull"; dir = 8},/area/ovpst)
-"Ec" = (/obj/structure/machinery/light/small{dir = 1; light_id = "cargointake"},/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "purple"; tile_bot_rght = "purple"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
-"Ej" = (/obj/effect/decal/info_tag/pst/drm{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- DRM -
Dorms, Deck 37, Sector A"},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{dir = 4; icon_state = "bluecorner"},/area/ovpst)
+"Ec" = (/obj/structure/machinery/light/small{dir = 1; light_id = "cargointake"},/obj/structure/closet/modular/drawers,/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "purple"; tile_bot_rght = "purple"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
+"Ej" = (/obj/effect/decal/info_tag/pst/drm{dir = 4; pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- DRM -
Dorms, Deck 37, Sector A"},/turf/open/floor/almayer{dir = 4; icon_state = "bluecorner"},/area/ovpst)
"Ep" = (/obj/structure/surface/modular/table/gray{icon_state = "table_metal_black"},/obj/structure/eventterminal/puzzle03/historyterm{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Et" = (/obj/structure/eventterminal/puzzle05/pythia,/turf/open/floor/kutjevo/colors/blue/tile,/area/ovpst)
"Ev" = (/obj/structure/bed/chair/modular/office{dir = 1},/turf/open/floor/plating/modular/gray,/area/ovpst)
@@ -382,7 +385,7 @@
"ER" = (/obj/structure/bed/sofa/south/grey,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"EU" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst)
"EZ" = (/turf/open/floor/almayer{dir = 4; icon_state = "orangecorner"},/area/ovpst)
-"Fd" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer,/area/ovpst)
+"Fd" = (/obj/structure/machinery/light{dir = 8; brightness = 12},/turf/open/floor/almayer,/area/ovpst)
"Fe" = (/turf/open/floor/almayer{icon_state = "emeraldcorner"},/area/ovpst)
"Fi" = (/obj/structure/eventterminal/puzzle03/historycrt{pixel_y = 32},/turf/open/floor/almayer{icon_state = "blue2orange"; dir = 1},/area/ovpst)
"Fj" = (/obj/structure/machinery/light{dir = 2},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
@@ -426,11 +429,12 @@
"Je" = (/obj/effect/decal/info_tag/pst/t14{pixel_y = 16; desc = "UACM Outer Veil Primary Supply Terminal
- T-14 - Hideaway O37
"},/obj/structure/machinery/light/small{dir = 4; light_id = "sec-1"},/turf/open/floor/almayer{icon_state = "black"; dir = 1},/area/ovpst)
"Jg" = (/obj/structure/bed/chair/comfy/black{dir = 1},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Jj" = (/obj/structure/ladder{id = "hd_nw_1"; icon_state = "ladder10"; height = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
+"Jr" = (/obj/structure/bed/chair/modular/office,/turf/open/floor/plating/modular{tile_bot_left = "eclipsebrown"; tile_bot_rght = "eclipsebrown"; tile_top_left = "eclipsebrown"; tile_top_rght = "eclipsebrown"; tile_seal = "black"},/area/ovpst)
"Js" = (/obj/structure/machinery/light{dir = 8; brightness = 14},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Ju" = (/turf/closed/wall/almayer,/area/ovpst/airlock/ele_d_drm)
"JB" = (/turf/open/floor/plating/almayer{icon_state = "purple-white"},/area/ovpst)
"JH" = (/obj/effect/decal/info_tag/pst/eng{dir = 8; pixel_y = 0; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- ENG - G01 -
Dock 31 Cargo Processing Subsystems"; desc_lore = "The label ENG indicates doors and areas related to controlling and maintaining the mechanical and computer elements of a colony, ship or station. G01 indicates that this area is open to anyone who is quartered on the station. Engineering doors with general access usually suggest that general maintenance equipment is available somewhere behind this door. This door leads to maintenance corridors related to the cargo processing system of Dock 31 and usually are only accessed if there is an issue with the cargo intake. A maintenance room with equipment needed to diagnose issues with the cargo system should be somewhere at the end of this path."},/turf/open/floor/almayer{dir = 8; icon_state = "orangecorner"},/area/ovpst)
-"JI" = (/obj/structure/machinery/light/small,/turf/open/floor/plating/modular{tile_bot_left = "eclipsebrown"; tile_bot_rght = "eclipsebrown"; tile_top_left = "eclipsebrown"; tile_top_rght = "eclipsebrown"; tile_seal = "black"},/area/ovpst)
+"JI" = (/obj/structure/machinery/light/small,/obj/structure/surface/modular/table,/turf/open/floor/plating/modular{tile_bot_left = "eclipsebrown"; tile_bot_rght = "eclipsebrown"; tile_top_left = "eclipsebrown"; tile_top_rght = "eclipsebrown"; tile_seal = "black"},/area/ovpst)
"JM" = (/obj/structure/surface/modular/table/gray{icon_state = "table_metal_black"},/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"JO" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{icon = 'icons/obj/structures/doors/Door2x1_secure2.dmi'},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"JU" = (/obj/structure/ladder{id = "hd_se_2"; icon_state = "ladder01"; height = 2},/turf/open/floor/almayer{icon_state = "blackfull"; dir = 4},/area/ovpst)
@@ -478,10 +482,10 @@
"Ni" = (/obj/structure/machinery/light{dir = 2},/turf/open/floor/almayer{icon_state = "black"; dir = 9},/area/ovpst)
"Nl" = (/obj/structure/machinery/light/small{dir = 8; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst)
"No" = (/turf/open/floor/plating/almayer{icon_state = "orange-silver"; dir = 8},/area/ovpst)
-"Ns" = (/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{dir = 1; icon_state = "greencorner"},/area/ovpst)
+"Ns" = (/turf/open/floor/almayer{dir = 1; icon_state = "greencorner"},/area/ovpst)
"Nv" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Nx" = (/turf/open/floor/plating/modular/gray{tile_bot_left = "navyblue"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
-"NB" = (/obj/structure/machinery/light{dir = 4; brightness = 12},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer,/area/ovpst)
+"NB" = (/obj/structure/machinery/light{dir = 4; brightness = 12},/turf/open/floor/almayer,/area/ovpst)
"NC" = (/obj/structure/toilet{dir = 4},/obj/structure/machinery/light/small{dir = 1; light_id = "cargointake"},/turf/open/floor/almayer{icon_state = "whitefull"; dir = 4},/area/ovpst)
"NE" = (/obj/structure/machinery/light/small,/obj/structure/crafting/packages/bed,/turf/open/floor/plating/modular,/area/ovpst)
"NG" = (/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "bloodred"},/area/ovpst)
@@ -510,6 +514,7 @@
"Px" = (/obj/structure/crafting/packages/table,/turf/open/floor/plating/modular,/area/ovpst)
"Pz" = (/turf/open/floor/almayer{dir = 10; icon_state = "emerald"},/area/ovpst)
"PF" = (/obj/structure/bed/chair/modular/office,/turf/open/floor/plating/modular/gray,/area/ovpst)
+"PG" = (/obj/structure/bed/modular{dir = 1},/turf/open/floor/plating/modular{tile_bot_left = "lavenderpurple"; tile_bot_rght = "lavenderpurple"; tile_top_left = "bloodred"; tile_top_rght = "bloodred"; tile_seal = "black"},/area/ovpst)
"PI" = (/obj/structure/sink{dir = 1; pixel_y = -8},/obj/structure/mirror{pixel_y = -26},/turf/open/floor/almayer{icon_state = "whitefull"; dir = 4},/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)
@@ -592,7 +597,7 @@
"Wm" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{icon = 'icons/obj/structures/doors/2x1almayerdoor_glass.dmi'; dir = 1},/turf/open/floor/plating/almayer{icon_state = "purplefull"; dir = 8},/area/ovpst)
"Wn" = (/obj/structure/machinery/light,/turf/open/floor/plating/almayer{icon_state = "purple"; dir = 8},/area/ovpst)
"Wq" = (/obj/effect/decal/info_tag/pst/eng{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- ENG -
Dorms Deck 37, Sector B, 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)
-"Wt" = (/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{dir = 4; icon_state = "silvercorner"},/area/ovpst)
+"Wt" = (/obj/structure/surface/modular/table,/turf/open/floor/plating/modular{tile_bot_left = "eclipsebrown"; tile_bot_rght = "eclipsebrown"; tile_top_left = "lavenderpurple"; tile_top_rght = "lavenderpurple"; tile_seal = "black"},/area/ovpst)
"Wx" = (/obj/effect/decal/info_tag/pst/t14{dir = 4; pixel_y = 0; desc = "UACM Outer Veil Primary Supply Terminal
- T-14 -
Hideaway O37"},/turf/open/floor/almayer{icon_state = "black"; dir = 4},/area/ovpst)
"WA" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; pixel_y = 0; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - Elevator Shaft D
"},/turf/open/floor/almayer{icon_state = "emerald"},/area/ovpst)
"WC" = (/turf/open/floor/plating/modular/gray{tile_bot_left = "bloodred"; tile_bot_rght = "bloodred"; tile_top_left = "bloodred"; tile_top_rght = "bloodred"},/area/ovpst)
@@ -607,13 +612,13 @@
"Xs" = (/obj/structure/window/framed/almayer/hull,/turf/closed/wall/almayer/outer,/area/ovpst/airlock/d31)
"Xy" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general/admin{dir = 2; opacity = 0},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"XC" = (/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 D, 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. "; dir = 8},/turf/open/floor/plating/almayer{icon_state = "orange-silver"; dir = 8},/area/ovpst)
-"XE" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{icon_state = "redcorner"},/area/ovpst)
+"XE" = (/obj/effect/decal/info_tag/pst/eld{dir = 1; desc = "UACM Outer Veil Primary Supply Terminal
- EL-C - G01 - Elevator Shaft D
"},/turf/open/floor/almayer{icon_state = "redcorner"},/area/ovpst)
"XF" = (/obj/structure/eventterminal/puzzle04/final_log{pixel_y = 25},/turf/open/floor/almayer{icon_state = "tcomms"},/area/ovpst)
"XG" = (/obj/structure/machinery/door/airlock/multi_tile/uacm/general{icon = 'icons/obj/structures/doors/2x1almayerdoor_glass.dmi'},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"XM" = (/turf/open/floor/almayer{dir = 5; icon_state = "orange"},/area/ovpst)
"XN" = (/obj/structure/crafting/packages/bed,/turf/open/floor/plating/modular,/area/ovpst)
"XP" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/plating/almayer{icon_state = "orange-silver"; dir = 4},/area/ovpst)
-"XU" = (/obj/structure/machinery/light{brightness = 12},/obj/effect/step_trigger/message/seeonce_blurb/Dorms,/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
+"XU" = (/obj/structure/machinery/light{brightness = 12},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"XV" = (/obj/effect/decal/info_tag/pst/lby{dir = 8; desc = "UACM Outer Veil Primary Supply Terminal
- LBY -
Dorms Deck 37 entrance lobby"; pixel_y = 16; pixel_x = -16},/turf/open/floor/almayer{dir = 8; icon_state = "blue2orange"},/area/ovpst)
"XZ" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Ya" = (/obj/structure/surface/modular/table,/turf/open/floor/plating/modular/gray{tile_bot_left = "navyblue"; tile_bot_rght = "navyblue"; tile_top_left = "navyblue"; tile_top_rght = "navyblue"},/area/ovpst)
@@ -621,13 +626,13 @@
"Yo" = (/turf/open/floor/almayer{icon_state = "plate"},/area/ovpst/airlock/d31)
"Ys" = (/turf/open/floor/plating/modular/gray{tile_bot_left = "navyblue"; tile_bot_rght = "black"; tile_top_left = "navyblue"; tile_top_rght = "black"},/area/ovpst)
"YL" = (/obj/structure/machinery/conveyor_switch{id = "d31-entrance"; pixel_x = 7; pixel_y = -6},/turf/open/floor/almayer{dir = 10; icon_state = "red"},/area/ovpst)
-"YT" = (/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "purple"; tile_bot_rght = "purple"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
+"YT" = (/obj/structure/bed/modular,/turf/open/floor/plating/modular{tile_seal = "black"; tile_bot_left = "purple"; tile_bot_rght = "purple"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
"YU" = (/obj/structure/machinery/door/poddoor/almayer/locked,/turf/open/floor/almayer{icon_state = "blackfull"; dir = 4},/area/ovpst)
"YY" = (/turf/open/floor/almayer{icon_state = "whitecorner"; dir = 1},/area/ovpst)
"Zg" = (/obj/effect/decal/info_tag/pst/mup{pixel_y = 16; pixel_x = -16; desc = "UACM Outer Veil Primary Supply Terminal
- MUP -
MUP 14-37"},/turf/open/floor/almayer{icon_state = "purplecorner"; dir = 1},/area/ovpst)
"Zh" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/open/floor/almayer{allow_construction = 0},/area/ovpst)
"Zn" = (/turf/closed/wall/almayer/outer,/area/ovpst/airlock/ele_d_drm)
-"Zo" = (/obj/structure/machinery/light/small{dir = 1},/turf/open/floor/plating/modular/gray{tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "black"},/area/ovpst)
+"Zo" = (/obj/structure/machinery/light/small{dir = 1},/obj/structure/surface/modular/table,/turf/open/floor/plating/modular/gray{tile_bot_left = "black"; tile_bot_rght = "black"; tile_top_left = "black"; tile_top_rght = "black"},/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)
"ZA" = (/obj/structure/machinery/door_control{pixel_y = -11; name = "inner door toggle"; id = "d31_cargo_fence"; specialfunctions = 4; req_access = list(1141); pixel_x = -12},/turf/open/floor/almayer{icon_state = "red"},/area/ovpst)
"ZB" = (/obj/structure/sink{dir = 8; pixel_y = 0; pixel_x = -9},/obj/structure/machinery/light/small{dir = 8},/turf/open/floor/almayer{icon_state = "silverfull"},/area/ovpst)
@@ -667,8 +672,8 @@ IAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSlhlheAlhlhlheAlhpOpOpOpOpORlRlRlpOpOlhlhlh
IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSiowfiolhiowfiolhpOpOpOKxpOpOpOpOpOpOlhZBKXKXlhiowfioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOlhsDojGWiohWVaMdiohWVajliohWVaMdiohWVajliohWVaQtSkCMCCWmWniohWVaMdiohWVajliohWVaMdiohWVajliohWVaSRojsDlhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioiolhioioiolhfvpObmeJpOpOKxpOpOCBlhlhlhKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSjgpOlhsDlhlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhscOrlhlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhsDlhpOjgTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioiolhioioiolhpOULolbmpOpObmlxVppOlhWWCmKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSOsyqlhsDlhlhXNQzvjlhvjQzvjlhvjQzvjlhvjQzvjlhXNWGvjlhlhioiolhlhvjQzvjlhvjQzvjlhmCQzvjlhvjQzvjlhYTEcTflhlhsDlhIEOsTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
-IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioiolhioioiolhpOpOpOULpOpOhYbmpOpOlhlhlhKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOvXlhiqlhlhPxvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhSxvjvjlhlhioiolhlhvjvjvjlhvjvjvjlhXNvjvjlhvjvjvjlhaJaJaJlhlhvXlhKHpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
-IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSiopZiolhiopZiolhpOpOpOpOpOpOfkpOpOpOlhWWCmKXlhiopZioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTXVgIzNolhlhtNvjvjlhSxvjvjlhvjXNtNlhvjvjvjlhPxvjvjlhlhioiolhlhvjvjvjlhvjvjvjlhPxvjvjlhvjvjvjlhaJaJaJlhlhVgIzNoTXTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAew
+IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSioioiolhioioiolhpOpOpOULpOpOhYbmpOpOlhlhlhKXlhioioioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOvXlhiqlhlhPxvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhSxvjvjlhlhioiolhlhvjvjvjlhvjvjvjlhXNvjvjlhvjvjvjlhaJrvaJlhlhvXlhKHpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
+IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSiopZiolhiopZiolhpOpOpOpOpOpOfkpOpOpOlhWWCmKXlhiopZioTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTXVgIzNolhlhtNvjvjlhSxvjvjlhvjXNtNlhvjvjvjlhPxvjvjlhlhioiolhlhvjvjvjlhvjvjvjlhPxvjvjlhvjvjvjlhlTrvaJlhlhVgIzNoTXTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAew
IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhpOpOwRhuskskljwRpOpOlhlhlhlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSZPlhlhmCvjvjlhvjvjmClhvjmCSxlhmCvjtNlhtNvjvjlhlhWIzvlhlhvjmCtNlhvjmCXNlhSxvjvjlhXNmCvjlhaJmbaJlhlhZRTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhlhlhlhlhlhlhJOpOlhlhlhlhlhlhlhlhlhlhlhTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhvjiNSxlhXNYiPxlhvjiNPxlhPxsTXNlhvjiNvjlhlhioiolhlhSxRZXNlhSxYiPxlhtNiNvjlhPxYiSxlhNGgzWhlhlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
IAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSxSxNmJwZpOHZpOpOpOpOHZNhkCkCfONvpOpOpONvpOxNpOUIfJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhioiolhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
@@ -695,20 +700,20 @@ qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIA
qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhqelhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhKXlhmKlhxNwZlhKXKXKXKXKXlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhqelhlhlhlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSxvxvTSTSxvxvxvxvxvTSTSxvxvTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDsDBmlFWJsDsDsDFZsDsDsDsDsDFZsDsDsDsDFZsDsDsDlhNCKfKXmlKXlhxNwZlhmKlhlhlhmKlhsDsDsDsDsDsDsDsDFZsDsDsDsDsDFZsDsDsDBmlFXrsDsDsDsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSrIMJpOLNrIERERERMJpOLNrIMJTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhlhKXKXBclhucDelhNlBclhVlmUlhsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdhdhdhdhdhdhdhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhdeMFzilhItUoZMlhampjzilhdeMFzilhPirMPilhsDlhVlmlKXKXrWlhdEdalhKZBalhafKZlhsDlhPxFOXNlhmCFOPxlhdeMFamlhamMFzilhezjVjklhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIATSfvpOhdybhdybhdybybhdhdpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhPFamamlhVHVHVHlhamamamlhamamamlhNQNQNQlhsDlhlhlhsoKXlhlhXGpOlhlhlhlhlhlhlhsDlhtNmCvjlhvjvjtNlhziamamlhamamamlhApfDAplhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhEGamamlhggggkmlhamamamlhamamamlhosososlhsDlhlhWtyLyLiGnCyLyLBXrvrvrvrvlhlhsDlhvjvjvjlhvjvjvjlhamamamlhamamamlhICApIClhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESEdqSaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhEvamamlhgghvTwlhamSqIQlhamamamlhWHWHWHlhnalhlhrvhdzKhdhdPePehdhdzKhdrvlhlhSLlhvjvjvjlhvjvjvjlhamamamlhamamamlhApICGnlhSLTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhamPlamlhWCbngglhamgwdelhamPlamlhWHJIWHlhsDlhlhFdzKhdzKhdPePehdzKhdzKNBlhlhsDlhvjiNvjlhvjNEvjlhamPlamlhamBvPFlhICifIClhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhfphdzKhdzKPePezKhdzKhdDLlhlhCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOhdhdhdhdhdhdhdhdhdpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhdeMFzilhItUoZMlhampjzilhdeMFzilhPirMAElhsDlhVlmlKXKXrWlhdEdalhKZBalhafKZlhsDlhPxFOXNlhmCFOPxlhdeMFamlhamMFzilhezjVjklhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSaSaSaSaSaSaSaSaSaSaSaSaIAIAIAIAIAIAIAIAIATSfvpOhdybhdybhdybybhdhdpOCBTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhPFamamlhVHVHVHlhamamamlhamamamlhNQNQPGlhsDlhlhlhsoKXlhlhXGpOlhlhlhlhlhlhlhsDlhtNmCvjlhvjvjtNlhziamamlhamamamlhApfDAplhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvcepOhdhdhdhdhdhdhdhdhdpOcexvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhEGamamlhggggkmlhamamamlhamamamlhososWtlhsDlhlhHaycyciGnCyLyLBXioioioiolhlhsDlhvjvjvjlhvjvjvjlhamamamlhamamamlhICApIClhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESEdqSaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhEvamamlhgghvTwlhamSqIQlhamamamlhWHJrJrlhnalhlhiohdzKhdhdPePehdhdzKhdiolhlhSLlhvjvjvjlhvjvjvjlhamamamlhamamamlhApICGnlhSLTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvIRpOpOpOpOpOpOpOpOpOpOpOIRxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhamPlamlhWCbngglhamgwdelhamPlamlhWHJIBLlhsDlhlhFdzKhdzKhdPePehdzKhdzKNBlhlhsDlhvjiNvjlhvjNEvjlhamPlamlhamBvPFlhICifIClhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIAxvbopOpOpOpOpOpOpOpOpOpOpOboxvIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSlhlhfphdzKhdzKPePezKhdzKhdvJlhlhCSlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhCSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOwRpOhWVaVaMdpOwRpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSlFeNRBYYiDnVRBYYmeKBRBYYllnVRBYYVUKBRBYYZLNblFCgzGhMPePePePePePePePePePetLxLXVlFqZRBYYBenVRBYYVUKBRBYYllnVRBYYmeKBRBYYMYNbaATSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSlhlhlhlhlhlhyXpOlhlhlhlhlhTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSKzLjiohWVaMdiohWVajliohWVaMdiohWVajliohWVaWqcoyFzohMPePePePeSFzNPePePePetLkqPjTACaiohWVaMdiohWVajliohWVaMdiohWVajliohWVaFAcoTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOAqFizFpOlhRBZWlhZhZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSlhlhNshdzKhdzKPePezKhdzKhdEjlhlhCSlhlhlhkElhlhlhkElhlhlhkElhlhlhkElhlhlhkElhCSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSEppOpOpOpOlhfvCBlhnbZhGMGMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhEGpjamlhxopTNxlhvjfsvjlhdeMFamlhQFZoiJlhsDlhlhFdzKhdhdhdPePehdzKhdzKNBlhlhsDlhvjfsvjlhvjfsvjlhvjfsvjlhvjfsvjlhmCfsvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSJgnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhBlamamlhtighgflhvjvjvjlhamamamlhmxiJiJlhsDlhlhrvhdzKzKhdPePehdhdzKhdrvlhlhsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhPxvjvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhamamamlhKFYaghlhvjvjvjlhPFamamlhxVxVxVlhsDlhlhrvAEXUAEXElTlTDFlTtervrvlhlhSLlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhtNvjvjlhSLTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASakjSESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhamamamlhhxlsYslhPxmCvjlhEGamamlhvxvxvxlhsDlhlhlhlhlhlhlhxQyklhgvlhlhlhlhlhsDlhmCvjSxlhtNvjmClhSxvjtNlhvjmCSxlhSxvjvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
-qgIAIAIAIAIAIAIAIAIAIAIAIASaQIFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhamPlwHlhiJzViJlhtNsTXNlhEvPlzilhvxLOvxlhnalhlhpOpOpOpOUmAjdPemAjFzpOpOlhlhsDlhtNNEPxlhXNsTPxlhXNhSPxlhtNNEPxlhXNiNvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSJgnkqMqMvslhpOpOlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhBlamamlhtighgflhvjvjvjlhamamamlhmxiJiJlhsDlhlhiohdzKzKhdPePehdhdzKhdiolhlhsDlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhPxvjvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaSESESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSqMqMqMqMOXlhBVSclhzxpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSSLlhamamamlhKFYaghlhvjvjvjlhPFamamlhxVxVxVlhsDlhlhiopOXUpOXEuDuDDFuDteioiolhlhSLlhvjvjvjlhvjvjvjlhvjvjvjlhvjvjvjlhtNvjvjlhSLTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASakjSESESESESESESESESESESaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMpOLBaMpOLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhamamamlhhxlsYslhPxmCvjlhEGamamlhlAvxvxlhsDlhlhlhlhlhlhlhxQyklhgvlhlhlhlhlhsDlhmCvjSxlhtNvjmClhSxvjtNlhvjmCSxlhSxvjvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
+qgIAIAIAIAIAIAIAIAIAIAIAIASaQIFWMGMGMGQIFWMGMGMGQISaIAIAIAIAIAIAIAIAIATSpOpOpOpOaMeqLBaMXyLBZhZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhamPlwHlhiJzViJlhtNsTXNlhEvPlzilhDLLOvxlhnalhlhpOpOpOpOUmAjdPemAjFzpOpOlhlhsDlhtNNEPxlhXNsTPxlhXNhSPxlhtNNEPxlhXNiNvjlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIAIATStHtHstjTjTjTnztHCETSTSoQTSoQvMoQTSoQxvoQTSGMGMGMGMIslhhZgYlhRzpOZhpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDlhlhtrpOpOpOpOpOkcgoBupOpOxwlhlhsDlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhlhsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIAIATSpOpOpOygTQkppOpOpOrIERMJJMrIERMJJMrIERLAlhBRGMGMGMHrlhfvCBlhZhZhpOpOTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSsDsDsDOOsDsDsDsDsDsDOOsDsDsDsDsDOOsDsDsDsDsDsDlhlhpOpOpOpOpOpOGJpLOtpOpOpOlhlhsDsDsDOOsDsDsDsDsDsDOOsDsDsDsDsDOOsDsDsDsDsDsDTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg
qgIAIAIAIAIAIAIAIAIAIAIAIAIATSfvpOpOpOTQogogogogogogogogogogogogogkVmZpOLBpOoCpOpOlhpOpOlhnbZhqMqMTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqgIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIATSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSlhlhpOpOpOpOpOpOBFlhlhemememlhTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSTSIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAIAqg