From 3299a41db4f4b96afee50e0c23545f1913d012b8 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 30 Sep 2023 04:17:50 -0600 Subject: [PATCH 01/21] Move Minigame Spawns All this does is move the minigame spawns from old positions near CC to 18,200 and 42,200, closer to the top left corner of the map. --- _maps/map_files/generic/CentCom.dmm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d37877d5bee6..5f3a0101d266 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -16789,7 +16789,7 @@ aa aa aa aa -aa +Fi aa aa aa @@ -22957,7 +22957,7 @@ aa aa aa aa -aa +gt aa aa aa @@ -37676,7 +37676,7 @@ aa aa aa aa -Fi +aa aa aa aa @@ -43844,7 +43844,7 @@ aa aa aa aa -gt +aa aa aa aa From a69ba2115d19b7613aebd73e0aec270b2aadc3e1 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:03:50 -0600 Subject: [PATCH 02/21] draw the rest of the fucking owl lots of changes: removals: all the CE belts, CE room, Medbay Mechbay additions: Admin Offices, version 1 Dressing Room, version 1 other changes: Auxiliary Announcement Closet moved to AdminLand CC Cargo moved to a more anti-Tide position Tiny fans added to CC Arrivals Kitchen and Bar expansions Hardened many locations to resist tiding. This may be reverted at a later date once programming supports zone-level lockout of areas not intended for CC Ghost Interns. --- _maps/map_files/generic/CentCom.dmm | 8648 ++++++++++++++------------- 1 file changed, 4586 insertions(+), 4062 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 5f3a0101d266..315a67a29154 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5,15 +5,13 @@ "ad" = ( /turf/open/space, /area/space) -"ag" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/ce, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) +"ai" = ( +/obj/item/flashlight/lamp, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "al" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/entertainment/money_large, @@ -70,7 +68,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/centcom/central_command_areas/admin) +/area/centcom/central_command_areas/ferry) "av" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, @@ -95,6 +93,10 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"ay" = ( +/obj/structure/aquarium, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "aB" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/yellow{ @@ -102,21 +104,6 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) -"aD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/computer/monitor{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron, -/area/centcom/central_command_areas/admin/storage) "aE" = ( /obj/structure/sign/poster/contraband/clown{ pixel_y = 3 @@ -138,7 +125,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/centcom/central_command_areas/admin) +/area/centcom/central_command_areas/ferry) "aL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -156,6 +143,18 @@ /obj/machinery/stove, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"aO" = ( +/obj/structure/window/plasma/spawner/directional/east, +/obj/structure/window/plasma/spawner/directional/north, +/obj/machinery/clonepod{ + desc = "A seemingly older and different piece of technology that was capable of near perfect clones over much longer timeframes than now almost completely banned cloning vat technology.
The glass dome seems to be dirty and frosted over, obscuring the contents of the vat. The status and operating panel seems to have been hijacked, a familiar 'card' connected to its operations interface." + }, +/obj/machinery/clonepod{ + desc = "A seemingly older and different piece of technology that was capable of near perfect clones over much longer timeframes than now almost completely banned cloning vat technology.
The glass dome seems to be dirty and frosted over, obscuring the contents of the vat. The status and operating panel seems to have been hijacked, a familiar 'card' connected to its operations interface."; + name = "biovat" + }, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "aP" = ( /obj/structure/chair{ dir = 1 @@ -181,8 +180,10 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "aX" = ( -/obj/machinery/clonepod/experimental, /obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/machinery/computer/cloning{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) "aZ" = ( @@ -261,7 +262,9 @@ dir = 4 }, /obj/machinery/door/airlock/security/glass{ - name = "Central Command Brig" + name = "Central Command Brig"; + max_integrity = 1800; + normal_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/entrance, /obj/effect/mapping_helpers/airlock/access/any/admin/general, @@ -273,11 +276,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) -"bp" = ( -/obj/item/trash/sosjerky, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "bu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -297,6 +295,10 @@ desc = "This is a plaque commemorating the thunderdome and all those who have died at its pearly blast doors." }, /area/centcom/tdome/observation) +"by" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "bA" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular{ @@ -403,17 +405,13 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; - req_access = list("cent_captain") + req_access = list("cent_captain"); + max_integrity = 1800 }, /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"bS" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/mob_spawn/corpse/human/clown, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "bT" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -448,18 +446,12 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"cd" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) +"cf" = ( +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/supply) "cg" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/evacuation) -"ch" = ( -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "ci" = ( /obj/effect/turf_decal/tile/neutral/full, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -517,6 +509,13 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) +"cp" = ( +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "cq" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -530,6 +529,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"cs" = ( +/obj/machinery/modular_computer/console/preset/id/centcom, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "ct" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/security/glass{ @@ -538,14 +541,8 @@ /obj/effect/mapping_helpers/airlock/access/any/security/court, /turf/open/floor/iron, /area/centcom/central_command_areas/courtroom) -"cw" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/lighter, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/camera, -/obj/item/storage/photo_album, +"cv" = ( +/obj/structure/closet/crate/bin, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) "cA" = ( @@ -565,6 +562,16 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"cB" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom Security"; + normal_integrity = 1800; + max_integrity = 1800 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) "cD" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -575,6 +582,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"cF" = ( +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "cG" = ( /obj/structure/table/wood/fancy/red, /obj/item/storage/cans/sixsoda, @@ -583,13 +593,6 @@ }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) -"cI" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "cJ" = ( /obj/docking_port/stationary{ dir = 4; @@ -601,11 +604,6 @@ }, /turf/open/space/basic, /area/space) -"cK" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/basic/frog, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "cL" = ( /obj/item/gun/energy/pulse/carbine/loyalpin, /obj/item/flashlight/seclite, @@ -679,7 +677,7 @@ dir = 1 }, /turf/open/floor/iron, -/area/centcom/central_command_areas/admin) +/area/centcom/central_command_areas/ferry) "de" = ( /obj/effect/landmark/start/new_player, /turf/closed/indestructible/start_area, @@ -695,6 +693,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) +"dk" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "dm" = ( /turf/open/floor/wood, /area/centcom/tdome/administration) @@ -719,6 +725,13 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"dr" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 4 + }, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) "dv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -737,7 +750,7 @@ /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) +/area/centcom/central_command_areas/ferry) "dy" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/crate_loot, @@ -758,6 +771,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"dB" = ( +/obj/machinery/vending/wardrobe/jani_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "dG" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks{ @@ -804,11 +825,6 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron, /area/centcom/tdome/observation) -"dO" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/simple_animal/pet/gondola, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "dQ" = ( /obj/structure/sign/poster/contraband/tipper_cream_soda{ pixel_y = 35 @@ -816,25 +832,18 @@ /obj/machinery/griddle, /turf/open/floor/iron/kitchen/herringbone, /area/centcom/central_command_areas/fore) +"dR" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/mob_spawn/corpse/human/intern, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "dV" = ( /obj/structure/table/wood, /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/storage/box/lethalshot, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/ammo_casing/shotgun/pulverizer, -/obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun, -/obj/item/gun/ballistic/shotgun/bulldog/unrestricted, /obj/item/holosign_creator/robot_seat/bar, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) @@ -946,8 +955,17 @@ }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) +"es" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 8 + }, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) "et" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/spawner/structure/window/reinforced{ + max_integrity = 1800 + }, /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; @@ -1025,6 +1043,14 @@ /obj/machinery/light/directional/south, /turf/open/misc/asteroid, /area/centcom/central_command_areas/evacuation) +"eL" = ( +/obj/machinery/vending/wardrobe/science_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "eM" = ( /obj/effect/turf_decal/delivery, /obj/effect/spawner/random/vending/colavend, @@ -1053,14 +1079,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"eP" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/mob_spawn/corpse/human/intern, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "eQ" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -1098,6 +1116,12 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"eU" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "eV" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law, @@ -1159,24 +1183,23 @@ "fo" = ( /turf/open/floor/iron/smooth, /area/centcom/central_command_areas/prison) -"fs" = ( -/obj/structure/cable, -/obj/effect/spawner/structure/window/reinforced/indestructible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/ferry) -"fv" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +"fp" = ( +/obj/item/kirbyplants/photosynthetic, +/turf/open/floor/grass/fairy, /area/centcom/central_command_areas/admin) "fw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"fx" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/toy/figure/dsquad, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "fy" = ( /obj/structure/signpost/salvation{ icon = 'icons/obj/structures.dmi'; @@ -1327,6 +1350,11 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"gf" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/security/laptop, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "gg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -1376,11 +1404,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) -"gm" = ( -/obj/structure/table/wood, -/obj/item/storage/dice, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "gn" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -1441,9 +1464,10 @@ /turf/open/floor/iron, /area/centcom/tdome/observation) "gy" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/vending/wardrobe/robo_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) @@ -1463,10 +1487,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"gB" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "gC" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; - name = "CentCom Stand" + name = "CentCom Stand"; + max_integrity = 1800 }, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -1491,9 +1523,15 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "gI" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/obj/structure/statue/gold/rd, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) +"gJ" = ( +/obj/item/kirbyplants{ + icon_state = "plant-22" + }, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/wood, /area/centcom/central_command_areas/admin) "gO" = ( /turf/closed/indestructible/riveted, @@ -1592,6 +1630,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) +"hj" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "hk" = ( /obj/machinery/suit_storage_unit/industrial, /obj/item/mod/control/pre_equipped/responsory/medic, @@ -1642,6 +1684,15 @@ }, /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation) +"hr" = ( +/obj/structure/table/wood/fancy/green{ + name = "Head Intern Desk" + }, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/structure/window/plasma/spawner/directional/east, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "ht" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -1662,6 +1713,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"hw" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "hx" = ( /obj/machinery/photocopier, /turf/open/floor/iron/grimy, @@ -1670,14 +1727,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) -"hE" = ( -/obj/structure/chair/comfy/black, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/grimy, +"hC" = ( +/obj/structure/dresser, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"hD" = ( +/turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) "hG" = ( /obj/structure/flora/bush/sparsegrass/style_random, @@ -1700,6 +1755,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"hK" = ( +/obj/structure/table/wood/fancy/green{ + name = "Head Intern Desk" + }, +/obj/item/clipboard, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "hN" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -1777,6 +1839,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"ij" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "ik" = ( /turf/open/misc/ashplanet/wateryrock{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15"; @@ -2094,7 +2160,9 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Central Command Brig" + name = "Central Command Brig"; + normal_integrity = 1800; + max_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/entrance, /obj/effect/mapping_helpers/airlock/access/any/admin/general, @@ -2512,6 +2580,10 @@ dir = 1 }, /area/centcom/central_command_areas/prison) +"jW" = ( +/obj/machinery/computer/records/medical, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "kc" = ( /obj/machinery/hydroponics/constructable/helper, /turf/open/floor/carpet/neon/simple/black/nodots, @@ -2547,6 +2619,15 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"kn" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/microwave, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) +"ko" = ( +/obj/item/storage/toolbox/fishing, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "kp" = ( /turf/open/floor/circuit/green, /area/centcom/central_command_areas/supply) @@ -2746,7 +2827,8 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; - req_access = list("cent_captain") + req_access = list("cent_captain"); + max_integrity = 1800 }, /obj/machinery/light/directional/west, /obj/machinery/status_display/evac/directional/west, @@ -2766,7 +2848,9 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/item/gavelblock, /obj/item/gavelhammer, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/south{ + max_integrity = 1800 + }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "ld" = ( @@ -2778,7 +2862,8 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; - req_access = list("captain") + req_access = list("captain"); + max_integrity = 1800 }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) @@ -2786,14 +2871,17 @@ /obj/structure/table/wood, /obj/structure/window/reinforced/spawner/directional/east, /obj/item/megaphone, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/south{ + max_integrity = 1800 + }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "lf" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; name = "CentCom Stand"; - req_access = list("cent_captain") + req_access = list("cent_captain"); + max_integrity = 1800 }, /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, @@ -2806,6 +2894,11 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"lm" = ( +/obj/structure/window/plasma/spawner/directional/north, +/obj/structure/window/plasma/spawner/directional/west, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "ln" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -2877,6 +2970,22 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supplypod) +"lz" = ( +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"lB" = ( +/obj/machinery/light/directional/west, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) +"lD" = ( +/obj/machinery/vending/wardrobe/hydro_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "lG" = ( /obj/structure/table/wood/fancy/royalblue, /obj/structure/window/spawner/directional/south, @@ -2954,6 +3063,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"lQ" = ( +/obj/machinery/computer/records/medical/laptop, +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "lR" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -2964,15 +3078,9 @@ /obj/structure/fans/tiny/invisible, /turf/open/floor/holofloor/hyperspace, /area/centcom/central_command_areas/supplypod/supplypod_temp_holding) -"lT" = ( -/obj/machinery/mech_bay_recharge_port{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/centcom/central_command_areas/control) +"lU" = ( +/turf/closed/indestructible/fakeglass, +/area/centcom/central_command_areas/fore) "lV" = ( /obj/structure/chair{ dir = 8 @@ -3056,6 +3164,16 @@ /obj/structure/table/wood, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"mq" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/obj/effect/spawner/random/special_lighter, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "ms" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -3063,15 +3181,13 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/tdome/administration) -"mu" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ +"mw" = ( +/obj/structure/cable, +/obj/structure/chair/comfy/black{ dir = 4 }, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "my" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/medical, @@ -3292,11 +3408,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) -"nj" = ( -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron, -/area/centcom/tdome/observation) "nk" = ( /obj/structure/flora/bush/pale/style_random, /obj/structure/flora/bush/generic/style_random, @@ -3324,12 +3435,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"no" = ( -/obj/structure/plasticflaps/opaque, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "np" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron, @@ -3339,7 +3444,9 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Central Command Courtroom" + name = "Central Command Courtroom"; + max_integrity = 1800; + normal_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/court, /obj/effect/mapping_helpers/airlock/access/any/service/lawyer, @@ -3371,6 +3478,12 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"nz" = ( +/obj/effect/spawner/structure/window/reinforced{ + max_integrity = 1800 + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/prison) "nA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3407,6 +3520,13 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/centcom/central_command_areas/fore) +"nF" = ( +/obj/machinery/door/airlock/centcom{ + name = "Council Chambers" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "nG" = ( /obj/machinery/computer/security/mining{ dir = 1 @@ -3445,6 +3565,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"nR" = ( +/obj/structure/closet/wardrobe/miner, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "nS" = ( /obj/structure/bookcase/random, /obj/machinery/light/directional/north, @@ -3460,6 +3584,10 @@ }, /turf/open/floor/iron/tgmcemblem, /area/centcom/central_command_areas/prison) +"nU" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) "nV" = ( /obj/structure/chair{ dir = 4 @@ -3536,6 +3664,14 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"og" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/banhammer, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "oh" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -3750,6 +3886,11 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"oT" = ( +/obj/structure/table/wood, +/obj/machinery/fax, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "oU" = ( /obj/structure/closet/emcloset, /obj/item/tank/internals/emergency_oxygen/engi, @@ -3786,14 +3927,11 @@ /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) "pa" = ( -/obj/machinery/door/airlock/centcom{ - name = "Shuttle Control Office" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) +/obj/structure/lattice, +/obj/structure/lattice, +/obj/structure/marker_beacon/lime, +/turf/open/space/basic, +/area/space) "pc" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -3823,15 +3961,16 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) "ph" = ( -/obj/machinery/computer/cloning{ - dir = 1 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, /obj/machinery/light/directional/east, +/obj/machinery/clonepod/experimental, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"pi" = ( +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "pj" = ( /obj/structure/chair/office{ dir = 8 @@ -3864,6 +4003,12 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"pp" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "pr" = ( /obj/structure/chair, /obj/machinery/newscaster/directional/north, @@ -3888,6 +4033,12 @@ /obj/machinery/vending/imported/yangyu, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"pz" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "pA" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -4030,6 +4181,11 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron/dark/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"qa" = ( +/obj/machinery/computer/records/security/laptop, +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "qc" = ( /obj/item/book/manual/wiki/security_space_law, /obj/item/taperecorder, @@ -4068,6 +4224,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"qj" = ( +/obj/machinery/vending/wardrobe/cargo_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "qk" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -4150,6 +4315,10 @@ name = "plating" }, /area/centcom/central_command_areas/control) +"qx" = ( +/obj/structure/window/plasma/spawner/directional/east, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "qy" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -4205,14 +4374,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/ert) -"qH" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "qI" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4226,7 +4387,9 @@ /area/centcom/tdome/observation) "qL" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security" + name = "CentCom Security"; + max_integrity = 1800; + normal_integrity = 1800 }, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/any/security/armory, @@ -4293,6 +4456,10 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"rd" = ( +/obj/structure/statue/silver/janitor, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "rk" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/courtroom) @@ -4487,19 +4654,13 @@ /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/armory) "rZ" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 +/obj/machinery/vending/wardrobe/chem_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) -"sa" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/warning, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "sb" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -4744,8 +4905,14 @@ "sV" = ( /obj/machinery/door/poddoor/shuttledock, /obj/effect/turf_decal/delivery, +/obj/structure/fans/tiny, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"sW" = ( +/obj/machinery/light/directional/east, +/obj/item/kirbyplants/random, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "sY" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Supplypod Loading" @@ -4910,6 +5077,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"tB" = ( +/obj/machinery/computer/records/security, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "tC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -4921,6 +5092,12 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/open/floor/iron, /area/centcom/tdome/administration) +"tE" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "tF" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Locker Room" @@ -5038,6 +5215,12 @@ "tW" = ( /turf/open/indestructible/hierophant/two, /area/centcom/central_command_areas/admin) +"tX" = ( +/obj/structure/chair/comfy{ + dir = 8 + }, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "ub" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 9 @@ -5069,12 +5252,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) -"uh" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "uj" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -5170,6 +5347,19 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"uB" = ( +/obj/machinery/vending/wardrobe/chap_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) +"uD" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "uG" = ( /obj/effect/turf_decal/siding/yellow, /turf/open/floor/iron, @@ -5178,11 +5368,31 @@ /obj/effect/turf_decal/stripes/line, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supply) +"uI" = ( +/obj/machinery/vending/wardrobe/engi_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "uK" = ( /obj/machinery/processor, /obj/effect/turf_decal/stripes/end, /turf/open/floor/iron, /area/centcom/tdome/observation) +"uL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/obj/item/storage/box/lethalshot, +/obj/item/gun/ballistic/shotgun/bulldog/unrestricted, +/obj/item/storage/backpack/duffelbag/syndie/ammo/shotgun, +/turf/open/floor/iron/dark, +/area/centcom/tdome/administration) "uM" = ( /obj/machinery/chem_master/condimaster{ name = "HoochMaster 2000" @@ -5204,12 +5414,6 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) -"uP" = ( -/obj/item/flashlight/lamp, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) "uR" = ( /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) @@ -5299,6 +5503,10 @@ "vk" = ( /turf/open/floor/carpet/cyan, /area/centcom/central_command_areas/control) +"vn" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "vo" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/shower/directional/south, @@ -5315,6 +5523,14 @@ /obj/structure/chair/comfy/brown, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"vs" = ( +/obj/structure/table/wood/fancy/green{ + name = "Intern Desk" + }, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "vt" = ( /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -5326,12 +5542,22 @@ dir = 8 }, /obj/machinery/door/airlock/security{ - name = "Central Command Legal Affairs" + name = "Central Command Legal Affairs"; + normal_integrity = 1800; + max_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/court, /obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/iron, /area/centcom/central_command_areas/courtroom) +"vv" = ( +/obj/machinery/light/directional/south, +/obj/item/kirbyplants/random, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) +"vx" = ( +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "vA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/engineering{ @@ -5379,7 +5605,7 @@ /area/centcom/central_command_areas/ferry) "vF" = ( /obj/machinery/door/airlock/centcom{ - name = "Administrative Office" + name = "AdminLand" }, /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -5494,22 +5720,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) -"vY" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_y = 5 - }, -/obj/item/clothing/mask/cigarette/cigar/havana{ - pixel_x = 2 - }, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "vZ" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -5567,13 +5777,6 @@ }, /turf/open/floor/elevated, /area/centcom/central_command_areas/fore) -"wq" = ( -/obj/structure/chair/comfy/black{ - dir = 1 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "wr" = ( /obj/structure/chair{ dir = 4 @@ -5726,10 +5929,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"wQ" = ( +/obj/structure/water_source/puddle, +/mob/living/basic/frog, +/obj/structure/window/spawner/directional/north, +/obj/structure/window/spawner/directional/south, +/obj/structure/window/spawner/directional/east, +/obj/structure/window/spawner/directional/west, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "wR" = ( -/obj/machinery/shower/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 +/obj/machinery/vending/wardrobe/medi_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) @@ -5744,6 +5957,19 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"wU" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/centcom{ + name = "CentCom"; + max_integrity = 1800; + normal_integrity = 1800 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/security/armory, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) "wW" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -5772,6 +5998,12 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) +"xa" = ( +/obj/structure/chair/office, +/obj/structure/window/plasma/spawner/directional/west, +/obj/structure/window/plasma/spawner/directional/north, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "xb" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -5853,6 +6085,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"xm" = ( +/obj/machinery/status_display/ai/directional/south, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "xn" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -6057,11 +6293,6 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"yl" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/basic/crab, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "yn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum, @@ -6094,6 +6325,14 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"yt" = ( +/obj/machinery/vending/wardrobe/det_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "yv" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/medical{ @@ -6120,6 +6359,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"yE" = ( +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "yG" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -6144,6 +6389,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"yM" = ( +/obj/item/kirbyplants, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "yO" = ( /obj/machinery/computer/communications, /obj/machinery/status_display/evac/directional/north, @@ -6161,6 +6410,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"yQ" = ( +/obj/structure/flora/tree/jungle/style_3, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "yS" = ( /obj/structure/table/reinforced, /obj/item/storage/box/emps, @@ -6249,6 +6502,14 @@ planetary_atmos = 0 }, /area/awaymission/errorroom) +"zj" = ( +/obj/machinery/vending/autodrobe/all_access{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "zk" = ( /obj/machinery/door/airlock/medical/glass{ name = "CentCom Medbay" @@ -6566,7 +6827,9 @@ "AC" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/security{ - name = "Central Command Legal Affairs" + name = "Central Command Legal Affairs"; + max_integrity = 1800; + normal_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/service/lawyer, /turf/open/floor/iron, @@ -6581,6 +6844,7 @@ "AE" = ( /obj/structure/sink/directional/east, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/centcom/tdome/observation) "AF" = ( @@ -6609,10 +6873,11 @@ "AH" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) -"AK" = ( -/obj/machinery/light_switch/directional/north, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) +"AJ" = ( +/obj/structure/lattice, +/obj/structure/marker_beacon/lime, +/turf/open/space/basic, +/area/space) "AL" = ( /obj/structure/chair/office{ dir = 1 @@ -6622,6 +6887,22 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"AQ" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/lighter, +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/camera, +/obj/item/storage/photo_album, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"AS" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "AT" = ( /obj/structure/sign/departments/medbay/alt, /turf/closed/indestructible/riveted, @@ -6690,6 +6971,31 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"Be" = ( +/obj/item/clothing/head/soft/fishing_hat, +/obj/structure/table/wood, +/obj/item/fishing_line, +/obj/item/fishing_line/reinforced, +/obj/item/fishing_rod/tech, +/obj/item/fishing_rod/tech, +/obj/item/fishing_hook/weighted, +/obj/item/fishing_hook/weighted, +/obj/item/fishing_hook/stabilized, +/obj/item/fishing_hook/stabilized, +/obj/item/fishing_hook/shiny, +/obj/item/fishing_hook/shiny, +/obj/item/fishing_hook/jaws, +/obj/item/fishing_hook/jaws, +/obj/item/fishing_hook/bone, +/obj/item/fishing_hook/bone, +/obj/item/bait_can/worm/premium, +/obj/item/bait_can/worm/premium, +/obj/item/bait_can/worm/premium, +/obj/item/bait_can/worm/premium, +/obj/item/bait_can/worm/premium, +/obj/item/bait_can/worm/premium, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "Bj" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -6703,7 +7009,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, -/area/centcom/central_command_areas/admin) +/area/centcom/central_command_areas/ferry) "Bn" = ( /obj/structure/table/wood/fancy/royalblue, /obj/structure/sign/painting/library_secure{ @@ -6725,6 +7031,19 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/tdome/administration) +"Bq" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/item/kirbyplants{ + icon_state = "plant-15"; + pixel_x = -6; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Br" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -6737,9 +7056,9 @@ "Bs" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/bot, /obj/item/storage/bag/tray, /obj/item/kitchen/fork, -/obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) "Bt" = ( @@ -6748,7 +7067,9 @@ dir = 8 }, /obj/machinery/door/airlock/security{ - name = "Central Command Legal Affairs" + name = "Central Command Legal Affairs"; + normal_integrity = 1800; + max_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/court, /turf/open/floor/iron, @@ -6967,12 +7288,8 @@ /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) "BT" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/toy/figure/dsquad, -/obj/machinery/computer/security/telescreen/entertainment/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/obj/structure/statue/sandstone/assistant, +/turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "BU" = ( /obj/item/clipboard, @@ -6986,13 +7303,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"BV" = ( -/obj/vehicle/sealed/mecha/odysseus, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/recharge_floor, -/area/centcom/central_command_areas/control) "BW" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -7180,6 +7490,11 @@ /obj/effect/spawner/random/engineering/tank, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"CS" = ( +/obj/machinery/door/airlock/centcom, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "CT" = ( /obj/structure/table/reinforced, /obj/structure/railing{ @@ -7204,12 +7519,6 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) -"CU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) "CV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/grimy, @@ -7308,6 +7617,14 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"Dw" = ( +/obj/item/storage/dice, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"Dx" = ( +/obj/item/kirbyplants/random, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Dy" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -7387,14 +7704,9 @@ /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) "DK" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer" +/obj/machinery/door/airlock/maintenance{ + name = "Trash Collection" }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/obj/effect/mapping_helpers/airlock/access/any/engineering/ce, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/evacuation) "DL" = ( @@ -7402,13 +7714,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) -"DQ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "DS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /mob/living/basic/butterfly, @@ -7444,12 +7749,23 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Ek" = ( +/obj/machinery/door/airlock/centcom{ + locked = 1; + name = "CentCom Auxiliary Announcement Closet" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/general, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Eq" = ( /obj/structure/chair/stool/bar/directional/east, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit/old, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/evacuation/ship) +"Et" = ( +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "Ew" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -7581,6 +7897,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) +"Fa" = ( +/obj/structure/statue/gold/ce, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Fb" = ( /obj/machinery/vending/boozeomat, /turf/closed/indestructible/riveted, @@ -7590,6 +7910,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"Fd" = ( +/obj/machinery/light/directional/west, +/obj/structure/closet/wardrobe/mixed, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Fe" = ( /obj/structure/sink/directional/west, /obj/structure/mirror/directional/east, @@ -7633,8 +7958,24 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"Fl" = ( +/obj/machinery/light/directional/south, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) +"Fm" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/item/banhammer{ + desc = "A terrible weapon that has seen countless use over the ages. This one appears to have taken a beating."; + force = -10 + }, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "Fo" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/spawner/structure/window/reinforced{ + max_integrity = 1800 + }, /obj/structure/sign/directions/engineering{ desc = "A sign that shows there are doors here. There are doors everywhere!"; icon_state = "doors"; @@ -7703,6 +8044,17 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"FI" = ( +/obj/structure/filingcabinet/filingcabinet, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) +"FJ" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/machinery/fax, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "FK" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -7724,6 +8076,23 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"FR" = ( +/obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"FT" = ( +/obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/effect/spawner/random/bureaucracy/folder, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/structure/window/plasma/spawner/directional/west, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "FW" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/entertainment/money_small, @@ -7765,6 +8134,10 @@ dir = 1 }, /area/centcom/central_command_areas/prison) +"Ge" = ( +/obj/structure/statue/gold/hop, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Gf" = ( /obj/machinery/firealarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -7772,6 +8145,11 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"Gg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Gi" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/rack, @@ -7818,6 +8196,15 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"Gz" = ( +/obj/machinery/computer/auxiliary_base/directional/north, +/obj/structure/table/reinforced, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/red, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) "GA" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/ferry) @@ -7854,7 +8241,9 @@ dir = 8 }, /obj/machinery/door/airlock/security/glass{ - name = "Central Command Brig" + name = "Central Command Brig"; + max_integrity = 1800; + normal_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/entrance, /obj/effect/mapping_helpers/airlock/access/any/admin/general, @@ -7866,6 +8255,11 @@ dir = 8 }, /area/centcom/central_command_areas/prison) +"GH" = ( +/obj/machinery/light/directional/east, +/obj/item/statuebust, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "GJ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/engineering{ @@ -7899,6 +8293,22 @@ }, /turf/open/floor/wood, /area/centcom/central_command_areas/fore) +"GQ" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets/donkpocketberry, +/obj/item/storage/box/donkpockets/donkpockethonk, +/obj/item/storage/box/donkpockets/donkpocketpizza, +/obj/item/storage/box/donkpockets/donkpocketspicy, +/obj/item/storage/box/donkpockets/donkpocketteriyaki, +/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/obj/effect/spawner/random/special_lighter, +/obj/effect/spawner/random/special_lighter, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) "GT" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -7912,6 +8322,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"GZ" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Ha" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -7980,6 +8397,12 @@ /obj/effect/mapping_helpers/airlock/access/any/security/armory, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"Hp" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Hs" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security" @@ -7997,9 +8420,11 @@ "Hv" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/courtroom) -"Hw" = ( -/turf/open/floor/glass/reinforced/plasma, -/area/centcom/central_command_areas/evacuation) +"Hy" = ( +/obj/structure/window/plasma/spawner/directional/north, +/obj/structure/window/plasma/spawner/directional/east, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Hz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -8048,6 +8473,12 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"HO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, +/obj/structure/cable, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "HR" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -8070,6 +8501,14 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"Ic" = ( +/obj/machinery/vending/wardrobe/atmos_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Id" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -8102,6 +8541,10 @@ dir = 4 }, /area/centcom/central_command_areas/prison) +"Ig" = ( +/obj/machinery/status_display/evac/directional/south, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Ih" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/supply) @@ -8146,6 +8589,12 @@ "It" = ( /turf/open/indestructible/event/plating, /area/centcom/tdome/arena/actual) +"Iu" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "Iv" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -8155,6 +8604,19 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"Ix" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) +"IB" = ( +/obj/structure/closet, +/obj/structure/window/plasma/spawner/directional/east, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "IE" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -8181,6 +8643,30 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"IL" = ( +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) +"IM" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = 8; + pixel_y = -4 + }, +/obj/item/pen{ + pixel_x = 8; + pixel_y = -4 + }, +/obj/item/flashlight/lamp{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "IP" = ( /obj/machinery/door/airlock/public/glass{ name = "Kitchen" @@ -8192,6 +8678,10 @@ }, /turf/open/floor/iron/kitchen/herringbone, /area/centcom/central_command_areas/fore) +"IS" = ( +/obj/machinery/door/poddoor/shutters/indestructible/preopen, +/turf/closed/indestructible/fakeglass, +/area/centcom/central_command_areas/admin) "IX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -8248,6 +8738,12 @@ }, /turf/open/indestructible/event/plating, /area/centcom/tdome/arena/actual) +"Jj" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 8 + }, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Jk" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -8277,11 +8773,25 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Jy" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants{ + icon_state = "plant-22" + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "JB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/machinery/gibber/autogibber, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/centcom/central_command_areas/fore) +"JC" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "JE" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -8298,11 +8808,6 @@ "JH" = ( /turf/open/indestructible/event/plating, /area/centcom/tdome/observation) -"JI" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/toy/figure/mime, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "JJ" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -8411,6 +8916,14 @@ /obj/effect/spawner/random/medical/memeorgans, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/centcom/central_command_areas/fore) +"Kh" = ( +/obj/machinery/vending/wardrobe/chef_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Km" = ( /obj/machinery/light/directional/west, /obj/machinery/status_display/evac/directional/west, @@ -8430,6 +8943,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"Ks" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Kt" = ( /obj/structure/chair/comfy/teal{ dir = 8 @@ -8439,13 +8956,16 @@ }, /turf/open/floor/carpet/cyan, /area/centcom/central_command_areas/control) -"Ky" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/simple_animal/hostile/retaliate/clown{ - limb_destroyer = 1 +"Kw" = ( +/obj/structure/chair/office{ + dir = 1 }, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) +"Kx" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) "KC" = ( /obj/machinery/status_display/evac/directional/south, /turf/open/floor/wood, @@ -8466,6 +8986,10 @@ "KH" = ( /turf/closed/wall/mineral/titanium, /area/centcom/central_command_areas/evacuation/ship) +"KI" = ( +/obj/structure/statue/gold/cmo, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "KJ" = ( /obj/structure/chair/stool/bar/directional/east, /obj/machinery/light/directional/north, @@ -8695,6 +9219,10 @@ /obj/effect/spawner/structure/window/reinforced/shuttle, /turf/open/floor/plating, /area/centcom/central_command_areas/evacuation/ship) +"Ly" = ( +/obj/structure/table/wood, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Lz" = ( /obj/structure/railing{ dir = 10; @@ -8836,11 +9364,6 @@ }, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/evacuation/ship) -"LS" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/basic/garden_gnome, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "LT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8867,6 +9390,27 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"Me" = ( +/obj/structure/table/wood, +/obj/machinery/door/window{ + max_integrity = 1800 + }, +/obj/item/radio/intercom{ + desc = "Talk smack through this."; + syndie = 1 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/courtroom) +"Mi" = ( +/obj/item/trash/sosjerky, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"Mj" = ( +/obj/machinery/light/directional/west, +/obj/item/statuebust, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Mn" = ( /obj/structure/table/wood/fancy/red, /obj/effect/spawner/random/food_or_drink/pizzaparty, @@ -8905,12 +9449,6 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) -"Mt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "Mu" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -8926,13 +9464,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) -"My" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "Mz" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8967,15 +9498,7 @@ /area/centcom/central_command_areas/evacuation/ship) "MI" = ( /obj/machinery/light/directional/north, -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/line, -/obj/effect/spawner/random/food_or_drink/donkpockets, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage, -/turf/open/floor/iron/dark/diagonal, +/turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) "MJ" = ( /obj/structure/chair/office, @@ -9017,9 +9540,10 @@ /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "MS" = ( -/obj/machinery/shower/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/vending/wardrobe/curator_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) @@ -9068,17 +9592,6 @@ "Ng" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/ghost_spawn) -"Nh" = ( -/obj/structure/table/wood, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/lighter, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/yellow/corner, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "Nk" = ( /obj/structure/sign/poster/contraband/syndicate_pistol, /turf/closed/indestructible/riveted, @@ -9105,22 +9618,16 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"No" = ( +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "Np" = ( /obj/structure/bookcase/random, /obj/structure/noticeboard/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"Nq" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "Nr" = ( /obj/structure/table/reinforced, /obj/item/folder/red, @@ -9175,17 +9682,9 @@ "NH" = ( /obj/structure/table/reinforced, /obj/item/food/mint, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 5 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/item/kitchen/spoon/soup_ladle, -/obj/item/kitchen/spoon/soup_ladle, -/obj/item/kitchen/spoon/soup_ladle, -/obj/item/reagent_containers/cup/soup_pot, /obj/item/reagent_containers/cup/soup_pot, -/obj/item/reagent_containers/cup/soup_pot, -/obj/item/kitchen/spoon/soup_ladle, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "NI" = ( @@ -9194,13 +9693,11 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) -"NJ" = ( -/obj/machinery/computer/mech_bay_power_console, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/centcom/central_command_areas/control) +"NK" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "NL" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -9210,11 +9707,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"NM" = ( -/obj/structure/closet/crate/bin, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "NN" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -9310,23 +9802,6 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"Ok" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = -4 - }, -/obj/item/pen{ - pixel_x = 8; - pixel_y = -4 - }, -/obj/item/flashlight/lamp{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "Om" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -9339,14 +9814,14 @@ /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/admin) "Op" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/rack, +/obj/item/clothing/suit/apron/chef, +/obj/item/kitchen/rollingpin, +/obj/item/clothing/head/utility/chefhat, +/obj/item/clothing/under/rank/civilian/chef/skirt, +/obj/item/clothing/under/rank/civilian/chef, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Oq" = ( @@ -9367,6 +9842,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Ou" = ( +/obj/item/kirbyplants/fern, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) +"Ov" = ( +/obj/effect/spawner/structure/window/reinforced{ + max_integrity = 1800 + }, +/turf/open/floor/plating, +/area/centcom/central_command_areas/courtroom) "Ow" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible{ dir = 1 @@ -9409,19 +9894,6 @@ }, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) -"OD" = ( -/obj/machinery/microwave{ - desc = "Cooks and boils stuff, somehow."; - pixel_x = -3; - pixel_y = 5 - }, -/obj/structure/table/wood, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/line, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "OE" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -9515,6 +9987,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"OT" = ( +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/obj/item/radio/intercom{ + desc = "Talk smack through this."; + pixel_x = 28; + syndie = 1 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "OU" = ( /obj/machinery/light/directional/east, /obj/machinery/chem_master, @@ -9597,18 +10081,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) -"Pg" = ( -/obj/machinery/computer/auxiliary_base/directional/north, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/folder/yellow, -/obj/item/pen/red, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/storage/belt/utility/chief/full{ - name = "Central Command Engineer's toolbelt" - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) +"Pi" = ( +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Pj" = ( /turf/closed/indestructible/fakeglass, /area/centcom/tdome/administration) @@ -9640,6 +10116,14 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"Pp" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/item/clipboard, +/obj/item/clipboard, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "Pq" = ( /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/prison) @@ -9729,10 +10213,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/armory) -"PF" = ( -/obj/structure/sign/nanotrasen, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/admin) "PH" = ( /obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/bin, @@ -9821,6 +10301,14 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron, /area/centcom/tdome/observation) +"PU" = ( +/obj/machinery/vending/wardrobe/sec_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "PV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -10043,6 +10531,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"QL" = ( +/obj/structure/chair/office/tactical, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "QM" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 8 @@ -10096,6 +10588,10 @@ "QV" = ( /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"QW" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "QX" = ( /obj/structure/flora/bush/ferny/style_random, /obj/structure/railing, @@ -10117,9 +10613,15 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"QZ" = ( +/obj/structure/statue/gold/qm, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Ra" = ( /obj/machinery/door/airlock/centcom{ - name = "CentCom Security" + name = "CentCom Security"; + max_integrity = 1800; + normal_integrity = 1800 }, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/any/security/brig, @@ -10195,30 +10697,6 @@ }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) -"Ro" = ( -/obj/structure/table/wood, -/obj/item/storage/box/donkpockets, -/obj/item/storage/fancy/cigarettes/cigars/cohiba{ - pixel_y = 3 - }, -/obj/item/crowbar/power, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/item/storage/belt/utility/chief/full{ - name = "Central Command Engineer's toolbelt" - }, -/mob/living/simple_animal/parrot{ - desc = "Poly the Parrot. Don't tell anyone, but the others are clones."; - health = 800; - limb_destroyer = 1; - name = "Poly Prime" - }, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "Rp" = ( /obj/machinery/computer/communications, /turf/open/floor/iron/dark/herringbone, @@ -10394,6 +10872,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) +"Sf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "Sg" = ( /obj/item/storage/briefcase{ pixel_x = -3; @@ -10483,16 +10970,18 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supplypod) "Sw" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/wood, +/obj/machinery/light/directional/west, +/obj/item/kirbyplants/random, +/turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "Sx" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/admin/storage) +"Sy" = ( +/obj/structure/lattice, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/supply) "Sz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -10554,6 +11043,18 @@ /obj/machinery/rnd/production/techfab/department/medical, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"SI" = ( +/obj/structure/closet, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) +"SJ" = ( +/obj/machinery/light/directional/east, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) +"SK" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "SM" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -10615,6 +11116,20 @@ "SZ" = ( /turf/closed/indestructible/fakeglass, /area/centcom/tdome/observation) +"Ta" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/computer/monitor{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/centcom/central_command_areas/admin/storage) "Tb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -10650,16 +11165,6 @@ "Ti" = ( /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"Tj" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/obj/machinery/suit_storage_unit/ce, -/turf/open/floor/iron/dark/diagonal, -/area/centcom/central_command_areas/evacuation) "Tl" = ( /obj/structure/table/wood, /obj/structure/plaque/static_plaque/thunderdome{ @@ -10691,10 +11196,12 @@ /area/centcom/central_command_areas/admin) "Tp" = ( /obj/structure/table/reinforced, -/obj/item/clothing/suit/apron/chef, -/obj/item/kitchen/rollingpin, /obj/machinery/status_display/evac/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/reagent_containers/cup/rag, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 5 + }, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Tq" = ( @@ -10748,6 +11255,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"Tx" = ( +/obj/machinery/modular_computer/console/preset/id/centcom, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Ty" = ( /obj/structure/table/reinforced, /obj/item/camera, @@ -10773,7 +11284,9 @@ "TD" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/security/glass{ - name = "Central Command Courtroom" + name = "Central Command Courtroom"; + normal_integrity = 1800; + max_integrity = 1800 }, /obj/effect/mapping_helpers/airlock/access/any/security/court, /obj/effect/mapping_helpers/airlock/access/any/service/lawyer, @@ -10825,6 +11338,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"TQ" = ( +/obj/structure/window/plasma/spawner/directional/north, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "TS" = ( /obj/structure/table/wood, /obj/item/dice/d20{ @@ -10843,13 +11360,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"TU" = ( -/obj/machinery/computer/security{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "TV" = ( /obj/item/storage/fancy/cigarettes/cigars{ pixel_y = 6 @@ -10881,6 +11391,11 @@ /obj/effect/spawner/random/exotic/antag_gear, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"TZ" = ( +/obj/structure/chair/office, +/obj/structure/window/plasma/spawner/directional/north, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Ua" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -10911,17 +11426,21 @@ /obj/structure/organ_creator, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"Ue" = ( +/obj/machinery/light/directional/north, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Uf" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) -"Uh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ +"Ug" = ( +/obj/structure/chair/sofa/bench/left{ dir = 8 }, -/turf/open/floor/wood, +/turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "Ui" = ( /obj/structure/table/wood, @@ -10963,6 +11482,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"Uq" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) "Ur" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/rank/civilian/curator/treasure_hunter, @@ -11012,6 +11536,17 @@ "Ux" = ( /turf/open/indestructible/hierophant, /area/centcom/central_command_areas/admin) +"Uy" = ( +/obj/item/toy/cards/deck/cas{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/toy/cards/deck/cas/black{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Uz" = ( /turf/open/floor/iron/tgmcemblem{ dir = 4 @@ -11024,6 +11559,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"UE" = ( +/obj/structure/statue/gold/hos, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "UH" = ( /obj/structure/closet/crate/freezer/blood, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -11042,6 +11581,13 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"UJ" = ( +/obj/machinery/door/airlock/centcom{ + name = "AdminLand" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/admin) "UM" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -11090,6 +11636,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"US" = ( +/obj/structure/window/plasma/spawner/directional/north, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "UT" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/contraband/armory, @@ -11103,6 +11653,11 @@ /obj/effect/spawner/random/exotic/antag_gear, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"UU" = ( +/obj/machinery/light/directional/north, +/obj/item/kirbyplants/random, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "UV" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -11125,19 +11680,17 @@ }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) +"Va" = ( +/obj/machinery/fishing_portal_generator, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "Vc" = ( -/obj/effect/decal/cleanable/vomit/old, -/turf/open/floor/iron/dark, +/turf/open/space/basic, /area/centcom/central_command_areas/control) "Vd" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) -"Vf" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/mob/living/simple_animal/hostile/retaliate/goose, -/turf/open/indestructible/dark, -/area/centcom/central_command_areas/prison/cells) "Vg" = ( /obj/structure/rack, /obj/item/gun/energy/e_gun{ @@ -11186,10 +11739,21 @@ /obj/structure/flora/bush/pale/style_random, /turf/open/misc/asteroid, /area/centcom/tdome/administration) +"Vm" = ( +/obj/machinery/vending/wardrobe/bar_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Vn" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) +"Vo" = ( +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/admin) "Vp" = ( /obj/structure/chair/office{ dir = 8 @@ -11255,11 +11819,6 @@ "Vx" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/fore) -"Vy" = ( -/obj/machinery/status_display/ai/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) "Vz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -11276,6 +11835,11 @@ "VG" = ( /turf/open/floor/carpet/neon/simple/lime/nodots, /area/centcom/tdome/observation) +"VJ" = ( +/obj/structure/window/plasma/spawner/directional/east, +/obj/machinery/photocopier/gratis, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "VK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -11309,13 +11873,21 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) +"VR" = ( +/obj/machinery/vending/wardrobe/law_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "VT" = ( /obj/structure/rack, -/obj/item/storage/box/donkpockets, -/obj/item/storage/box/donkpockets, -/obj/item/clothing/head/utility/chefhat, /obj/machinery/status_display/evac/directional/west, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "VW" = ( @@ -11374,6 +11946,7 @@ "Wf" = ( /obj/structure/sink/directional/west, /obj/effect/turf_decal/tile/red/fourcorners, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/centcom/tdome/observation) "Wg" = ( @@ -11392,20 +11965,19 @@ /obj/machinery/stove, /turf/open/floor/iron/kitchen/herringbone, /area/centcom/central_command_areas/fore) +"Wk" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 8 + }, +/turf/open/floor/carpet/executive, +/area/centcom/central_command_areas/admin) "Wl" = ( /obj/structure/table/wood, /obj/machinery/recharger, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"Wm" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, -/obj/machinery/light/directional/north, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/wood, -/area/centcom/central_command_areas/admin) "Wn" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -11434,34 +12006,32 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) +"Wu" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/cyan, +/area/centcom/central_command_areas/admin) "Wv" = ( /obj/machinery/barsign/all_access/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Ww" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 4 - }, -/obj/structure/bed/double{ - dir = 4 - }, -/obj/item/bedsheet/ce/double{ - dir = 4 - }, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = -29 - }, -/turf/open/floor/iron/dark/diagonal, +/obj/structure/closet/crate/bin, +/turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) "Wy" = ( /obj/structure/chair/office, /obj/effect/landmark/ert_spawn, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"Wz" = ( +/obj/machinery/vending/wardrobe/gene_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 + }, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "WD" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -11556,17 +12126,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"WP" = ( -/obj/machinery/computer/station_alert{ - dir = 8 - }, -/obj/item/radio/intercom{ - desc = "Talk smack through this."; - pixel_x = 28; - syndie = 1 - }, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "WQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ @@ -11594,14 +12153,8 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) -"WU" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/iron, +"WT" = ( +/turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) "WX" = ( /obj/machinery/light_switch/directional/west, @@ -11653,13 +12206,8 @@ /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Xf" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_pp/style_random, -/obj/structure/flora/bush/pointy/style_random, -/turf/open/floor/grass, +/obj/structure/closet/crate/trashcart, +/turf/open/floor/iron/white, /area/centcom/tdome/observation) "Xh" = ( /turf/open/floor/iron, @@ -11679,13 +12227,16 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) "Xl" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, +/obj/structure/sink/directional/north, +/obj/structure/mirror/directional/south, /turf/open/floor/iron/white, /area/centcom/tdome/observation) +"Xm" = ( +/obj/item/kirbyplants{ + icon_state = "plant-21" + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "Xn" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table/reinforced, @@ -11726,14 +12277,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/centcom/tdome/observation) -"Xu" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) "Xw" = ( /turf/open/floor/carpet/executive, /area/centcom/tdome/administration) @@ -11772,12 +12315,8 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) "XJ" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/generic/style_random, -/turf/open/floor/grass, +/obj/structure/table/wood, +/turf/open/floor/iron, /area/centcom/tdome/observation) "XK" = ( /obj/machinery/firealarm/directional/south, @@ -11795,6 +12334,10 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"XN" = ( +/obj/structure/chair/office, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "XQ" = ( /obj/machinery/computer/crew{ dir = 1 @@ -11805,6 +12348,16 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"XS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "XT" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/supplypod) @@ -11822,6 +12375,14 @@ "Ya" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/armory) +"Yb" = ( +/obj/structure/table/wood/fancy/green{ + name = "Intern Desk" + }, +/obj/item/clipboard, +/obj/structure/window/plasma/spawner/directional/west, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "Yc" = ( /obj/structure/fireplace, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -11836,12 +12397,6 @@ /obj/machinery/computer/camera_advanced, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) -"Yj" = ( -/obj/structure/chair/comfy/black, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/structure/cable, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "Yk" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/crate, @@ -11913,12 +12468,12 @@ /area/centcom/central_command_areas/control) "Yu" = ( /obj/structure/table/reinforced, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/reagentgrinder{ desc = "Used to grind things up into raw materials and liquids."; pixel_y = 5 }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) "Yv" = ( @@ -11949,14 +12504,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"YA" = ( -/obj/machinery/door/airlock/centcom{ - locked = 1; - name = "CentCom Auxiliary Announcement Closet" - }, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/control) "YD" = ( /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, @@ -12027,18 +12574,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) -"YQ" = ( -/obj/structure/table/wood, -/obj/item/toy/cards/deck/cas{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "YT" = ( /obj/structure/table/wood, /obj/structure/plaque/static_plaque/thunderdome{ @@ -12093,15 +12628,9 @@ "Zf" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/admin) -"Zg" = ( -/obj/machinery/status_display/ai/directional/north, -/obj/item/kirbyplants{ - icon_state = "plant-15"; - pixel_x = -6; - pixel_y = 12 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +"Zh" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/wood, /area/centcom/central_command_areas/admin) "Zj" = ( /obj/machinery/status_display/evac/directional/north, @@ -12128,14 +12657,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"Zm" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/centcom/tdome/observation) +"Zn" = ( +/obj/structure/window/plasma/spawner/directional/west, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "Zo" = ( /obj/structure/sign/warning/vacuum/external, /turf/closed/indestructible/fakeglass, @@ -12333,11 +12858,10 @@ /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) "ZV" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 +/obj/machinery/vending/wardrobe/viro_wardrobe{ + default_price = 0; + extra_price = 0; + fair_market_price = 0 }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) @@ -38448,25 +38972,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +On +Zf +Zf +Zf +On +On +On +Zf +Zf +Zf +On +On +On +Zf +Zf +Zf +On +On aa aa aa @@ -38705,25 +39229,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +Tx +pi +pi +pi +Ly +On +Tx +pi +pi +pi +Ly +On +Tx +pi +pi +pi +Ly +On aa aa aa @@ -38962,25 +39486,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +gf +hw +pi +pi +oT +On +gf +hw +pi +pi +oT +On +gf +hw +pi +pi +oT +On aa aa aa @@ -39219,25 +39743,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +lQ +eU +NK +pi +pi +On +lQ +eU +NK +pi +pi +On +lQ +eU +NK +pi +pi +On aa aa aa @@ -39476,25 +40000,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +pi +pp +hw +pi +pi +On +pi +pp +hw +pi +pi +On +pi +pp +hw +pi +pi +On aa aa aa @@ -39733,25 +40257,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +pi +pi +pi +pi +pi +On +pi +pi +pi +pi +pi +On +pi +pi +pi +pi +pi +On aa aa aa @@ -39990,25 +40514,25 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +SI +SI +pi +pi +cv +On +SI +SI +pi +pi +cv +On +SI +SI +pi +pi +cv +On aa aa aa @@ -40240,39 +40764,39 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +On +On +On +On +On +On +On +On +On +GZ +IS +On +On +On +On +GZ +IS +On +On +On +On +GZ +IS +On +On +On +On +On +On +On +On +On aa aa aa @@ -40497,39 +41021,39 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +On +Tx +gf +uD +pi +pi +pi +On +cF +Dx +cF +cF +cF +lB +cF +Dx +cF +cF +cF +lB +cF +Dx +cF +cF +cF +On +pi +pi +pi +uD +gf +Hp +On aa aa aa @@ -40754,39 +41278,39 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Zf +pi +pi +eU +XN +pi +pi +On +Dx +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +IS +pi +pi +XN +eU +pi +pi +Zf aa aa aa @@ -41011,39 +41535,39 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Zf +pi +XN +NK +XN +pi +pi +CS +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +CS +pi +pi +XN +NK +JC +pi +Zf aa aa aa @@ -41268,6 +41792,39 @@ aa aa aa aa +Zf +pi +pi +pi +pi +pi +pi +IS +cF +cF +cF +cF +cF +Kx +WT +WT +WT +WT +WT +Kx +cF +cF +cF +cF +Dx +On +pi +pi +pi +pi +pi +pi +Zf aa aa aa @@ -41326,8 +41883,26 @@ aa aa aa aa +KH +Lt +LU +Ld +rG +Lt aa aa +Lt +EV +eX +mf +rz +wN +Lt +Lt +Lt +Lt +Lt +KH aa aa aa @@ -41353,32 +41928,16 @@ aa aa aa aa +"} +(114,1,1) = {" aa aa aa aa aa aa -KH -Lt -LU -Ld -rG -Lt aa aa -Lt -EV -eX -mf -rz -wN -Lt -Lt -Lt -Lt -Lt -KH aa aa aa @@ -41404,8 +41963,6 @@ aa aa aa aa -"} -(114,1,1) = {" aa aa aa @@ -41492,6 +42049,39 @@ aa aa aa aa +On +Ly +oT +SI +SI +pi +cv +On +cF +cF +cF +cF +cF +WT +kn +GQ +Wk +es +nU +WT +cF +cF +cF +cF +cF +On +cv +pi +SI +SI +oT +Ly +On aa aa aa @@ -41551,8 +42141,20 @@ aa aa aa aa +Lt +Lt +ge +Lt +Lt aa aa +KH +Lt +Cy +iC +Po +Lt +KH aa aa aa @@ -41583,6 +42185,11 @@ aa aa aa aa +"} +(115,1,1) = {" +aa +aa +aa aa aa aa @@ -41617,20 +42224,8 @@ aa aa aa aa -Lt -Lt -ge -Lt -Lt aa aa -KH -Lt -Cy -iC -Po -Lt -KH aa aa aa @@ -41661,8 +42256,6 @@ aa aa aa aa -"} -(115,1,1) = {" aa aa aa @@ -41713,6 +42306,39 @@ aa aa aa aa +On +On +On +On +On +On +On +On +Ue +cF +cF +cF +cF +Kx +WT +WT +WT +WT +WT +Kx +cF +cF +cF +cF +Fl +On +On +On +On +On +On +On +On aa aa aa @@ -41772,9 +42398,19 @@ aa aa aa aa +fT +Lo +Rk +Sd +pV aa aa aa +KH +Lt +Lt +Lt +KH aa aa aa @@ -41806,6 +42442,8 @@ aa aa aa aa +"} +(116,1,1) = {" aa aa aa @@ -41874,19 +42512,6 @@ aa aa aa aa -fT -Lo -Rk -Sd -pV -aa -aa -aa -KH -Lt -Lt -Lt -KH aa aa aa @@ -41918,8 +42543,6 @@ aa aa aa aa -"} -(116,1,1) = {" aa aa aa @@ -41940,6 +42563,39 @@ aa aa aa aa +On +Tx +gf +uD +pi +pi +pi +On +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +On +pi +pi +pi +uD +gf +Hp +On aa aa aa @@ -41999,6 +42655,11 @@ aa aa aa aa +Lt +Lt +ge +Lt +Lt aa aa aa @@ -42038,6 +42699,8 @@ aa aa aa aa +"} +(117,1,1) = {" aa aa aa @@ -42131,11 +42794,6 @@ aa aa aa aa -Lt -Lt -ge -Lt -Lt aa aa aa @@ -42162,6 +42820,39 @@ aa aa aa aa +Zf +pi +pi +eU +XN +pi +pi +On +Dx +cF +cF +hj +cF +cF +cF +cF +cF +cF +cF +cF +hj +cF +cF +cF +cF +IS +pi +pi +XN +eU +pi +pi +Zf aa aa aa @@ -42175,8 +42866,6 @@ aa aa aa aa -"} -(117,1,1) = {" aa aa aa @@ -42221,6 +42910,14 @@ aa aa aa aa +KH +Lt +Lt +Te +DL +CF +Lt +Lt aa aa aa @@ -42259,6 +42956,8 @@ aa aa aa aa +"} +(118,1,1) = {" aa aa aa @@ -42378,6 +43077,39 @@ aa aa aa aa +Zf +pi +XN +NK +XN +pi +pi +CS +cF +cF +cF +cF +cF +cF +Et +Et +yM +Et +Ou +cF +cF +cF +cF +cF +cF +CS +pi +pi +XN +NK +JC +pi +Zf aa aa aa @@ -42386,14 +43118,6 @@ aa aa aa aa -KH -Lt -Lt -Te -DL -CF -Lt -Lt aa aa aa @@ -42432,8 +43156,6 @@ aa aa aa aa -"} -(118,1,1) = {" aa aa aa @@ -42445,6 +43167,14 @@ aa aa aa aa +Lt +fz +za +MX +DL +ep +cP +MM aa aa aa @@ -42483,6 +43213,8 @@ aa aa aa aa +"} +(119,1,1) = {" aa aa aa @@ -42602,6 +43334,39 @@ aa aa aa aa +Zf +pi +pi +pi +pi +pi +pi +IS +cF +cF +cF +cF +cF +cF +Et +Et +yQ +Et +Et +cF +cF +cF +cF +cF +Dx +On +pi +pi +pi +pi +pi +pi +Zf aa aa aa @@ -42643,14 +43408,6 @@ aa aa aa aa -Lt -fz -za -MX -DL -ep -cP -MM aa aa aa @@ -42667,6 +43424,14 @@ aa aa aa aa +KH +Lt +cT +Hb +OC +ep +cP +KQ aa aa aa @@ -42689,8 +43454,6 @@ aa aa aa aa -"} -(119,1,1) = {" aa aa aa @@ -42707,6 +43470,8 @@ aa aa aa aa +"} +(120,1,1) = {" aa aa aa @@ -42826,6 +43591,39 @@ aa aa aa aa +On +Ly +oT +SI +SI +pi +cv +On +cF +cF +cF +cF +cF +cF +Et +Et +Et +wQ +Et +cF +cF +cF +cF +cF +cF +On +cv +pi +SI +SI +oT +Ly +On aa aa aa @@ -42884,6 +43682,13 @@ aa aa aa aa +KH +Lt +Lt +Lt +Lt +Lt +Lt aa aa aa @@ -42900,14 +43705,6 @@ aa aa aa aa -KH -Lt -cT -Hb -OC -ep -cP -KQ aa aa aa @@ -42930,6 +43727,8 @@ aa aa aa aa +"} +(121,1,1) = {" aa aa aa @@ -42946,8 +43745,6 @@ aa aa aa aa -"} -(120,1,1) = {" aa aa aa @@ -43051,6 +43848,39 @@ aa aa aa aa +On +On +On +On +On +On +On +On +Ue +cF +cF +cF +cF +cF +Et +Et +Et +Et +fp +cF +cF +cF +cF +cF +Fl +On +On +On +On +On +On +On +On aa aa aa @@ -43154,17 +43984,12 @@ aa aa aa aa +"} +(122,1,1) = {" aa aa aa aa -KH -Lt -Lt -Lt -Lt -Lt -Lt aa aa aa @@ -43203,8 +44028,6 @@ aa aa aa aa -"} -(121,1,1) = {" aa aa aa @@ -43282,6 +44105,39 @@ aa aa aa aa +On +Tx +gf +uD +pi +pi +pi +On +cF +cF +cF +cF +cF +cF +Jj +yE +Ug +cF +cF +cF +cF +cF +cF +cF +cF +On +pi +pi +pi +uD +gf +Hp +On aa aa aa @@ -43385,6 +44241,8 @@ aa aa aa aa +"} +(123,1,1) = {" aa aa aa @@ -43460,8 +44318,6 @@ aa aa aa aa -"} -(122,1,1) = {" aa aa aa @@ -43506,6 +44362,39 @@ aa aa aa aa +Zf +pi +pi +eU +XN +pi +pi +On +Dx +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +IS +pi +pi +XN +eU +pi +pi +Zf aa aa aa @@ -43609,6 +44498,8 @@ aa aa aa aa +"} +(124,1,1) = {" aa aa aa @@ -43717,8 +44608,6 @@ aa aa aa aa -"} -(123,1,1) = {" aa aa aa @@ -43730,6 +44619,39 @@ aa aa aa aa +Zf +pi +XN +NK +XN +pi +pi +CS +cF +cF +cF +hj +cF +cF +cF +cF +cF +cF +cF +cF +hj +cF +cF +cF +cF +CS +pi +pi +XN +NK +JC +pi +Zf aa aa aa @@ -43833,6 +44755,8 @@ aa aa aa aa +"} +(125,1,1) = {" aa aa aa @@ -43952,6 +44876,39 @@ aa aa aa aa +Zf +pi +pi +pi +pi +pi +pi +IS +cF +cF +cF +cF +cF +cF +Wu +Va +Va +Wu +cF +xa +Yb +cF +cF +cF +Dx +On +pi +pi +pi +pi +pi +pi +Zf aa aa aa @@ -43974,8 +44931,6 @@ aa aa aa aa -"} -(124,1,1) = {" aa aa aa @@ -44057,6 +45012,8 @@ aa aa aa aa +"} +(126,1,1) = {" aa aa aa @@ -44176,6 +45133,39 @@ aa aa aa aa +On +Ly +oT +SI +SI +pi +cv +On +cF +cF +cF +cF +cF +cF +Be +vx +vx +vx +cF +US +vs +cF +cF +cF +cF +On +cv +pi +SI +SI +oT +Ly +On aa aa aa @@ -44231,8 +45221,6 @@ aa aa aa aa -"} -(125,1,1) = {" aa aa aa @@ -44281,6 +45269,8 @@ aa aa aa aa +"} +(127,1,1) = {" aa aa aa @@ -44400,6 +45390,39 @@ aa aa aa aa +On +On +On +On +On +On +On +On +Ue +cF +cF +cF +cF +cF +ko +tX +tX +vx +cF +US +hj +cF +cF +cF +Fl +On +On +On +On +On +On +On +On aa aa aa @@ -44488,8 +45511,6 @@ aa aa aa aa -"} -(126,1,1) = {" aa aa aa @@ -44505,6 +45526,8 @@ aa aa aa aa +"} +(128,1,1) = {" aa aa aa @@ -44624,6 +45647,39 @@ aa aa aa aa +On +Tx +gf +uD +pi +pi +pi +On +cF +cF +cF +cF +cF +cF +Wu +ay +ay +Wu +cF +TZ +hK +cF +cF +cF +cF +On +pi +pi +pi +uD +gf +Hp +On aa aa aa @@ -44727,6 +45783,8 @@ aa aa aa aa +"} +(129,1,1) = {" aa aa aa @@ -44745,8 +45803,6 @@ aa aa aa aa -"} -(127,1,1) = {" aa aa aa @@ -44848,6 +45904,39 @@ aa aa aa aa +Zf +pi +pi +eU +XN +pi +pi +On +Dx +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +Hy +hr +cF +cF +cF +cF +IS +pi +pi +XN +eU +pi +pi +Zf aa aa aa @@ -44951,6 +46040,8 @@ aa aa aa aa +"} +(130,1,1) = {" aa aa aa @@ -45002,8 +46093,6 @@ aa aa aa aa -"} -(128,1,1) = {" aa aa aa @@ -45072,6 +46161,39 @@ aa aa aa aa +Zf +pi +XN +NK +XN +pi +pi +CS +cF +cF +cF +hj +cF +cF +cF +cF +cF +cF +cF +cF +hj +cF +cF +cF +cF +CS +pi +pi +XN +NK +JC +pi +Zf aa aa aa @@ -45175,6 +46297,8 @@ aa aa aa aa +"} +(131,1,1) = {" aa aa aa @@ -45259,8 +46383,6 @@ aa aa aa aa -"} -(129,1,1) = {" aa aa aa @@ -45296,6 +46418,39 @@ aa aa aa aa +Zf +pi +pi +pi +pi +pi +pi +IS +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +Dx +On +pi +pi +pi +pi +pi +pi +Zf aa aa aa @@ -45399,6 +46554,8 @@ aa aa aa aa +"} +(132,1,1) = {" aa aa aa @@ -45516,10 +46673,41 @@ aa aa aa aa -"} -(130,1,1) = {" aa aa +On +Ly +oT +SI +SI +pi +cv +On +cF +cF +cF +cF +lm +Zn +FT +Zn +Zn +Zn +hD +hD +hD +hD +cF +cF +Ig +On +cv +pi +SI +SI +oT +Ly +On aa aa aa @@ -45623,6 +46811,8 @@ aa aa aa aa +"} +(133,1,1) = {" aa aa aa @@ -45742,6 +46932,41 @@ aa aa aa aa +On +On +On +On +On +On +On +On +Ue +cF +cF +cF +TQ +AS +hD +AS +hD +hD +hD +gB +Pp +hD +cF +cF +Fl +On +On +On +On +On +On +On +On +On +On aa aa aa @@ -45753,6 +46978,12 @@ aa aa aa aa +GA +GA +mD +mD +GA +GA aa aa aa @@ -45773,23 +47004,6 @@ aa aa aa aa -"} -(131,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -45854,6 +47068,8 @@ aa aa aa aa +"} +(134,1,1) = {" aa aa aa @@ -45980,6 +47196,34 @@ aa aa aa aa +On +cF +cF +cF +cF +TQ +FI +hD +FI +hD +jW +hD +AS +mq +Kw +cF +cF +cF +On +cF +cF +Mj +cF +cF +cF +cF +cF +On aa aa aa @@ -45991,8 +47235,15 @@ aa aa aa aa +GA +Ga +sq +to +ZN +GA aa aa +Io aa aa aa @@ -46030,8 +47281,6 @@ aa aa aa aa -"} -(132,1,1) = {" aa aa aa @@ -46076,6 +47325,8 @@ aa aa aa aa +"} +(135,1,1) = {" aa aa aa @@ -46190,11 +47441,46 @@ aa aa aa aa +On +Zf +Zf +On +Zf +Zf +On aa aa aa aa aa +On +cF +cF +cF +cF +TQ +FI +hD +FI +hD +cs +hD +QL +pz +hD +Vo +Vo +Vo +UJ +Vo +Vo +Vo +Vo +Vo +Vo +Vo +vv +On aa aa aa @@ -46206,7 +47492,16 @@ aa aa aa aa +mD +FX +sr +tp +Xr +mD aa +GA +xc +GA aa aa aa @@ -46288,15 +47583,7 @@ aa aa aa "} -(133,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa +(136,1,1) = {" aa aa aa @@ -46411,11 +47698,46 @@ aa aa aa aa +On +oo +Tg +gD +Wl +Qb +On aa aa aa aa aa +On +cF +cF +cF +cF +TQ +FI +hD +FI +hD +tB +hD +AS +dk +hD +cF +cF +cF +On +cF +cF +GH +cF +cF +cF +Vo +cF +On aa aa aa @@ -46427,6 +47749,18 @@ aa aa aa aa +GA +rm +ss +tq +Ir +mD +vA +GA +xd +GA +yn +mD aa aa aa @@ -46454,12 +47788,6 @@ aa aa aa aa -GA -GA -mD -mD -GA -GA aa aa aa @@ -46511,6 +47839,8 @@ aa aa aa aa +"} +(137,1,1) = {" aa aa aa @@ -46544,8 +47874,6 @@ aa aa aa aa -"} -(134,1,1) = {" aa aa aa @@ -46627,6 +47955,46 @@ aa aa aa aa +On +AF +Xq +Xz +Xq +AQ +On +On +On +On +On +On +On +cF +cF +cF +cF +TQ +AS +hD +AS +hD +hD +hD +FJ +Fm +hD +cF +cF +cF +On +On +On +On +On +On +cF +Vo +cF +On aa aa aa @@ -46638,6 +48006,24 @@ aa aa aa aa +GA +rn +st +tr +um +mD +vB +GA +Xy +GA +oU +mD +ta +GA +td +GA +ta +mD aa aa aa @@ -46710,16 +48096,11 @@ aa aa aa aa +"} +(138,1,1) = {" aa -GA -Ga -sq -to -ZN -GA aa aa -Io aa aa aa @@ -46801,8 +48182,6 @@ aa aa aa aa -"} -(135,1,1) = {" aa aa aa @@ -46833,10 +48212,46 @@ aa aa aa aa +On +Bq +Rl +Br +tE +mw +Xq +gJ +Ix +Dw +Pi +eB +On +cF +cF +cF +cF +aO +qx +VJ +qx +IB +IB +hD +QW +hD +hD +cF +cF +xm +On aa aa aa aa +On +UU +Vo +Fa +On aa aa aa @@ -46848,6 +48263,24 @@ aa aa aa aa +mD +WY +su +ts +By +mD +vC +wr +xe +wr +wx +mD +pB +pT +pT +pT +qF +GA aa aa aa @@ -46920,6 +48353,8 @@ aa aa aa aa +"} +(139,1,1) = {" aa aa aa @@ -46968,16 +48403,7 @@ aa aa aa aa -mD -FX -sr -tp -Xr -mD aa -GA -xc -GA aa aa aa @@ -47043,10 +48469,46 @@ aa aa aa aa +On +Yc +VK +PR +og +HO +Xo +Xo +Gg +Uy +QV +oh +On +Ue +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +Fl +On aa aa aa aa +On +cF +Vo +cF +On aa aa aa @@ -47058,8 +48520,24 @@ aa aa aa aa -"} -(136,1,1) = {" +GA +nB +su +ts +pR +uO +vD +fw +xf +fw +yp +sd +pC +pU +pU +pU +qG +GA aa aa aa @@ -47132,6 +48610,8 @@ aa aa aa aa +"} +(140,1,1) = {" aa aa aa @@ -47225,18 +48705,6 @@ aa aa aa aa -GA -rm -ss -tq -Ir -mD -vA -GA -xd -GA -yn -mD aa aa aa @@ -47255,10 +48723,49 @@ aa aa aa aa +On +On +qq +On +Jy +pE +ia +Sf +Iu +Xq +Xq +Yq +Zh +Xq +ef +On +Dx +cF +cF +cF +cF +Kx +WT +WT +WT +WT +WT +Kx +cF +cF +cF +cF +cF +On aa aa aa aa +On +cF +Vo +cF +On aa aa aa @@ -47270,6 +48777,24 @@ aa aa aa aa +mD +eY +sv +tt +PH +mD +vE +wt +xg +wt +tn +mD +pD +pX +pX +pX +rb +GA aa aa aa @@ -47315,8 +48840,6 @@ aa aa aa aa -"} -(137,1,1) = {" aa aa aa @@ -47344,6 +48867,8 @@ aa aa aa aa +"} +(141,1,1) = {" aa aa aa @@ -47455,10 +48980,49 @@ aa aa aa aa +On +ry +TW +fG +nA +MU +MU +MU +Xq +Xq +Xm +XS +Od +Od +Dk +nF +cF +cF +cF +hj +cF +WT +nU +dr +IL +GQ +kn +WT +cF +cF +hj +cF +cF +On aa aa aa aa +On +cF +Vo +cF +On aa aa aa @@ -47470,6 +49034,25 @@ aa aa aa aa +mD +mD +mD +tu +mD +mD +mD +wu +xh +wu +mD +gO +zT +cn +gO +cn +zT +gO +gO aa aa aa @@ -47482,24 +49065,6 @@ aa aa aa aa -GA -rn -st -tr -um -mD -vB -GA -Xy -GA -oU -mD -ta -GA -td -GA -ta -mD aa aa aa @@ -47559,6 +49124,8 @@ aa aa aa aa +"} +(142,1,1) = {" aa aa aa @@ -47572,8 +49139,6 @@ aa aa aa aa -"} -(138,1,1) = {" aa aa aa @@ -47672,10 +49237,49 @@ aa aa aa aa +On +vo +fP +On +Qg +XV +hd +To +fx +On +ai +dz +Nr +Xq +Rg +Zf +cF +cF +cF +cF +cF +Kx +WT +WT +WT +WT +WT +Kx +cF +cF +cF +cF +cF +On aa aa aa aa +On +KI +Vo +vv +On aa aa aa @@ -47687,6 +49291,25 @@ aa aa aa aa +mD +Bm +pR +pR +pR +aK +mD +wv +wv +wv +mD +yL +WN +cb +wW +tb +aV +ho +gO aa aa aa @@ -47739,24 +49362,6 @@ aa aa aa aa -mD -WY -su -ts -By -mD -vC -wr -xe -wr -wx -mD -pB -pT -pT -pT -qF -GA aa aa aa @@ -47776,6 +49381,8 @@ aa aa aa aa +"} +(143,1,1) = {" aa aa aa @@ -47829,8 +49436,6 @@ aa aa aa aa -"} -(139,1,1) = {" aa aa aa @@ -47889,10 +49494,49 @@ aa aa aa aa +On +On +On +On +RU +XL +Yr +CV +nA +eD +CV +Vp +OY +tl +fN +On +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +On aa aa aa aa +On +cF +Vo +cF +On aa aa aa @@ -47904,6 +49548,25 @@ aa aa aa aa +mD +au +pR +dx +pR +dd +mD +WQ +xh +WQ +mD +WO +eF +eF +eF +eF +eF +db +gO aa aa aa @@ -47975,6 +49638,8 @@ aa aa aa aa +"} +(144,1,1) = {" aa aa aa @@ -47996,24 +49661,6 @@ aa aa aa aa -GA -nB -su -ts -pR -uO -vD -fw -xf -fw -yp -sd -pC -pU -pU -pU -qG -GA aa aa aa @@ -48086,8 +49733,6 @@ aa aa aa aa -"} -(140,1,1) = {" aa aa aa @@ -48106,10 +49751,49 @@ aa aa aa aa +Ie +tW +Ux +On +yO +To +ye +Gf +oV +On +Wq +Vz +uV +hT +TS +On +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +cF +On aa aa aa aa +On +cF +Vo +cF +On aa aa aa @@ -48121,6 +49805,25 @@ aa aa aa aa +mD +mD +mD +mD +mD +qR +mD +ww +xi +wz +qR +ib +eF +hx +TE +VL +eF +bU +MY aa aa aa @@ -48192,6 +49895,8 @@ aa aa aa aa +"} +(145,1,1) = {" aa aa aa @@ -48253,24 +49958,6 @@ aa aa aa aa -mD -eY -sv -tt -PH -mD -vE -wt -xg -wt -tn -mD -pD -pX -pX -pX -rb -GA aa aa aa @@ -48321,10 +50008,49 @@ aa aa aa aa +Nk +kh +tW +On +On +Oc +On +On +On +On +On +Kf +On +On +On +On +cF +cF +Dx +SJ +cF +Dx +cF +cF +cF +SJ +cF +Dx +cF +cF +cF +SJ +cF +On aa aa aa aa +On +UU +Vo +Ge +On aa aa aa @@ -48342,9 +50068,20 @@ aa aa aa aa +mD +ss +xj +fa +mD +So +eF +PX +Ke +eV +eF +gF +gO aa -"} -(141,1,1) = {" aa aa aa @@ -48415,6 +50152,8 @@ aa aa aa aa +"} +(146,1,1) = {" aa aa aa @@ -48510,24 +50249,94 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +On +On +On +On +ZT +To +WX +Ur +UR +YU +GB +Ub +aw +YU +On +On +GZ +IS +On +On +On +On +GZ +IS +On +On +On +On +GZ +IS +On +On +On +On +aa +aa +aa +aa +On +cF +Vo +cF +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On mD -mD -mD -tu -mD -mD -mD -wu -xh -wu -mD -gO -zT -cn -gO -cn -zT -gO +ss +fw +tr +gS +SM +WR +RH +WR +he +WR +ty gO aa aa @@ -48601,7 +50410,22 @@ aa aa aa "} -(142,1,1) = {" +(147,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -48701,7 +50525,76 @@ aa aa aa aa +On +eO +EJ +QV +QV +Mo +Sx +Gs +Ow +Ta +YU +SI +SI +pi +pi +cv +On +SI +SI +pi +pi +cv +On +SI +SI +pi +pi +cv +On +aa aa +On +On +On +On +On +cF +Vo +cF +UE +cF +cF +Sw +cF +cF +cF +gI +cF +cF +cF +Sw +cF +cF +cF +cF +rd +cF +mD +wx +fw +wB +yr +RH +RH +JW +eE +rB +RH +oA +gO aa aa aa @@ -48717,6 +50610,27 @@ aa aa aa aa +QC +QC +QC +QC +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf +uf aa aa aa @@ -48752,6 +50666,8 @@ aa aa aa aa +"} +(148,1,1) = {" aa aa aa @@ -48761,31 +50677,6 @@ aa aa aa aa -On -Zf -Zf -On -Zf -Zf -On -Bm -Hz -Hz -Hz -aK -mD -wv -wv -wv -mD -yL -WN -cb -wW -tb -aV -ho -gO aa aa aa @@ -48857,8 +50748,6 @@ aa aa aa aa -"} -(143,1,1) = {" aa aa aa @@ -48893,13 +50782,112 @@ aa aa aa aa +On +Ui +Cs +Hz +oB +ZF +YU +xy +Or +UI +YU +pi +pi +pi +pi +pi +On +pi +pi +pi +pi +pi +On +pi +pi +pi +pi +pi +On aa aa +On +Mi +dR +lz +Ek +cF +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +Vo +vF +wy +TK +xQ +mD +RH +Wy +Sk +Zs +RF +OX +NL +gO aa aa aa aa aa +QC +QC +QC +QC +QC +QC +QC +QC +QC +QC +QC +Hm +OE +Sl +ca +Wn +eH +Um +Wn +ca +Wn +eH +Um +uf +dm +Ob +Ob +Ob +Ob +fK +uf aa aa aa @@ -48935,6 +50923,8 @@ aa aa aa aa +"} +(149,1,1) = {" aa aa aa @@ -49018,31 +51008,6 @@ aa aa aa aa -On -oo -Tg -gD -Wl -Qb -On -au -Hz -dx -Hz -dd -mD -WQ -xh -WQ -mD -WO -eF -eF -eF -eF -eF -db -gO aa aa aa @@ -49074,13 +51039,114 @@ aa aa aa aa +On +On +On +On +On +On +YU +YU +Rj +kR +YU +pi +hw +hw +pi +pi +On +pi +hw +hw +pi +pi +On +pi +hw +hw +pi +pi +On aa aa +On +cp +OT +IM +On +cF +cF +cF +sW +cF +cF +QZ +cF +cF +cF +sW +cF +cF +cF +BT +cF +cF +cF +cF +sW +cF +gS +wz +TK +xR +OQ +Ny +PM +Om +SR +Yy +AL +oK +gO aa aa aa aa aa +QC +zj +Ic +Vm +qj +uB +Kh +nR +Fd +hC +QC +Sl +Sl +QC +uf +uf +Wn +Wn +uf +uf +uf +Wn +Wn +uf +mX +Xw +Xw +Xw +Xw +dH +uf +aa +aa aa aa aa @@ -49115,7 +51181,9 @@ aa aa aa "} -(144,1,1) = {" +(150,1,1) = {" +aa +aa aa aa aa @@ -49234,9 +51302,106 @@ aa aa aa aa +YU +Sh +Ps +QY +YU +lQ +eU +NK +pi +pi +On +lQ +eU +NK +pi +pi +On +lQ +eU +NK +pi +pi +On +aa +aa +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +On +mD +su +fw +wh +gS +NN +MJ +TI +Zl +zz +OX +aR +gO +aa +aa aa aa aa +QC +Ks +bi +bi +bi +bi +bi +bi +bi +bi +QC +Jt +gT +pI +tH +Bp +RB +UW +Bp +Fs +Bp +Js +Sz +Sz +Sz +Xw +Xw +Xw +Xw +dH +uf aa aa aa @@ -49272,34 +51437,11 @@ aa aa aa aa +"} +(151,1,1) = {" aa aa aa -On -AF -Xq -Xz -Xq -cw -On -On -On -On -On -PF -mD -ww -xi -wz -qR -ib -eF -hx -TE -VL -eF -bU -MY aa aa aa @@ -49371,8 +51513,6 @@ aa aa aa aa -"} -(145,1,1) = {" aa aa aa @@ -49419,6 +51559,29 @@ aa aa aa aa +Sx +Nn +yi +cL +YU +qa +pp +pi +pi +oT +On +qa +pp +pi +pi +oT +On +qa +pp +pi +pi +oT +On aa aa aa @@ -49427,15 +51590,18 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa +SK aa aa aa @@ -49444,11 +51610,55 @@ aa aa aa aa +mD +su +fw +bm +mD +SM +Ny +ar +fi +ar +Ny +sx +gO aa aa aa aa aa +QC +wR +gy +eL +PU +ZV +bi +bi +bi +Xl +QC +gT +Vr +pI +WM +Bp +yG +Bj +Bp +oI +Bp +Js +Js +Sz +Sz +Xw +Xw +Xw +Xw +dH +uf aa aa aa @@ -49484,6 +51694,8 @@ aa aa aa aa +"} +(152,1,1) = {" aa aa aa @@ -49532,31 +51744,6 @@ aa aa aa aa -On -Zg -Rl -Br -Xq -qH -On -fv -hE -gm -wq -eB -mD -ss -xj -fa -mD -So -eF -PX -Ke -eV -eF -gF -gO aa aa aa @@ -49628,38 +51815,30 @@ aa aa aa aa -"} -(146,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +YU +hY +ql +cA +YU +Tx +pi +pi +pi +Ly +On +Tx +pi +pi +pi +Ly +On +Tx +pi +pi +pi +Ly +On aa aa aa @@ -49668,26 +51847,75 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa +SK aa aa aa aa aa aa +mD +mD +mD +SF +fw +ts +qR +Mp +WR +RH +NC +RH +WR +dW +gO aa aa aa aa aa +QC +Ks +bi +bi +bi +bi +bi +bi +bi +bi +tF +PT +gT +QC +uf +uf +uf +uf +uf +uf +uf +Sz +Js +Js +Sz +Xw +Xw +Xw +Xw +dH +uf aa aa aa @@ -49723,6 +51951,8 @@ aa aa aa aa +"} +(153,1,1) = {" aa aa aa @@ -49789,31 +52019,6 @@ aa aa aa aa -On -Yc -VK -PR -Uh -Xo -WU -CU -Yj -YQ -uh -oh -fs -ss -fw -tr -gS -SM -WR -RH -WR -he -WR -ty -gO aa aa aa @@ -49868,6 +52073,29 @@ aa aa aa aa +YU +YU +YU +YU +YU +On +Zf +Zf +Zf +On +On +On +Zf +Zf +Zf +On +On +On +Zf +Zf +Zf +On +On aa aa aa @@ -49876,28 +52104,75 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa -"} -(147,1,1) = {" +SK aa aa aa aa aa aa +mD +uY +oe +su +fw +ts +mD +Ya +rY +ST +VO +ST +rY +Ya +Ya aa aa aa aa aa +QC +rZ +MS +yt +uI +Wz +lD +dB +VR +bi +QC +Qi +oi +QC +JH +JH +JH +JH +JH +JH +uf +Sz +Fc +Js +Sz +Sz +Sz +qv +PD +dm +uf aa aa aa @@ -49933,6 +52208,8 @@ aa aa aa aa +"} +(154,1,1) = {" aa aa aa @@ -50043,34 +52320,6 @@ aa aa aa aa -On -On -qq -On -gI -pE -ia -Mt -Sw -On -AK -Yq -Xq -Xq -ef -fs -wx -fw -wB -yr -RH -RH -JW -eE -rB -RH -oA -gO aa aa aa @@ -50085,36 +52334,19 @@ aa aa aa aa +SK aa aa -QC -QC -QC -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf -uf aa aa aa +SK aa aa aa aa aa +SK aa aa aa @@ -50129,27 +52361,75 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa +SK aa aa aa aa -"} -(148,1,1) = {" aa aa +mD +uZ +oe +su +fw +ts +mD +WG +Zv +sE +bH +sE +Zv +VZ +Ya aa aa aa aa +QC +QC +QC +QC +QC +QC +QC +QC +QC +QC +QC +QC +PT +Rh +QC +JH +JH +JH +JH +JH +JH +uf +uf +uf +Rr +Mv +Mv +Mv +uf +Bn +lG +uf aa aa aa @@ -50185,6 +52465,8 @@ aa aa aa aa +"} +(155,1,1) = {" aa aa aa @@ -50300,34 +52582,6 @@ aa aa aa aa -On -ry -TW -fG -nA -MU -MU -MU -NM -On -Wm -Nq -My -Od -Dk -vF -wy -TK -xQ -mD -RH -Wy -Sk -Zs -RF -OX -NL -gO aa aa aa @@ -50337,37 +52591,19 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa -QC -Hm -OE -Sl -ca -Wn -eH -Um -Wn -ca -Wn -eH -Um -uf -dm -Ob -Ob -Ob -Ob -fK -uf aa aa aa aa +SK aa aa aa @@ -50382,27 +52618,75 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa +SK aa aa aa aa aa aa +mD +uY +oe +su +xf +ts +mD +cm +bH +bH +bH +sE +sE +Vu +Ya aa aa -"} -(149,1,1) = {" aa aa +QC +PY +QC +oE +MK +pI +ZM +ru +tG +ru +tG +co +ED +oi +QC +JH +JH +JH +JH +JH +JH +JH +JH +uf +Sz +Js +Js +Sz +uf +uf +uf +uf aa aa aa @@ -50438,6 +52722,8 @@ aa aa aa aa +"} +(156,1,1) = {" aa aa aa @@ -50557,69 +52843,106 @@ aa aa aa aa -On -vo -fP -On -Qg -XV -hd -To -BT -On -uP -dz -Nr -Xq -Rg -gS -wz -TK -xR -OQ -Ny -PM -Om -SR -Yy -AL -oK -gO aa aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa -QC -Sl -Sl -QC -uf -uf -Wn -Wn -uf -uf +SK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +pa +SK +SK +SK +SK +SK +pa +SK +SK +SK +SK +pa +SK +SK +SK +SK +SK +SK +mD +oe +qR +wA +fw +ts +mD +Wd +bH +RV +Sq +gX +sE +yS +Ya +aa +aa +aa +aa +Sp +Pc +Sp +Qi +oi +pI +Qv +FZ +gE +FZ +gE +FZ +gE +cq +ZR +JH +JH +JH +JH +JH +JH +JH +JH uf +Sz +Js +Js +Sz Wn -Wn +zA uf -mX -Xw -Xw -Xw -Xw -dH uf aa aa @@ -50657,7 +52980,7 @@ aa aa aa "} -(150,1,1) = {" +(157,1,1) = {" aa aa aa @@ -50782,16 +53105,19 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa @@ -50806,77 +53132,74 @@ aa aa aa aa +SK aa aa aa aa aa +SK +aa +aa +aa +aa +SK +aa +aa +aa aa aa aa -On -On -On -On -RU -XL -Yr -CV -nA -eD -CV -Vp -OY -tl -fN mD +va +oe su fw -wh -gS -NN -MJ -TI -Zl -zz -OX -aR -gO -aa +ts +mD +gw +bH +bA +bj +Pt +sE +FB +Ya aa aa aa aa QC +Sl QC +PT +Nl QC QC +at QC QC QC +DF QC QC QC -QC -Jt -gT -pI -tH -Bp -RB -UW -Bp -Fs -Bp -Js -Sz +JH +JH +JH +JH +JH +JH +JH +JH +uf Sz +Js +Js Sz -Xw -Xw -Xw -Xw -dH +Wn +ga +uf uf aa aa @@ -50914,1534 +53237,7 @@ aa aa aa "} -(151,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Ie -tW -Ux -On -yO -To -ye -Gf -oV -On -Wq -Vz -uV -hT -TS -mD -su -fw -bm -mD -SM -Ny -ar -fi -ar -Ny -sx -gO -aa -aa -aa -aa -aa -QC -wR -gy -oH -QC -ZV -Xu -cd -Zm -Xl -QC -gT -Vr -pI -WM -Bp -yG -Bj -Bp -oI -Bp -Js -Js -Sz -Sz -Xw -Xw -Xw -Xw -dH -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(152,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -yV -aa -aa -aa -aa -aa -aa -aa -aa -Nk -kh -tW -On -On -Oc -On -On -On -On -On -Kf -On -On -On -mD -SF -fw -ts -qR -Mp -WR -RH -NC -RH -WR -dW -gO -aa -aa -aa -aa -aa -QC -cI -ie -bi -NP -bi -bi -bi -bi -bi -tF -PT -gT -QC -uf -uf -uf -uf -uf -uf -uf -Sz -Js -Js -Sz -Xw -Xw -Xw -Xw -dH -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(153,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -iX -jk -jr -iX -jr -jI -Ih -aa -aa -aa -aa -Ih -Ih -iF -iF -iF -On -ZT -To -WX -Ur -UR -YU -GB -Ub -aw -YU -uY -oe -su -fw -ts -mD -Ya -rY -ST -VO -ST -rY -Ya -Ya -aa -aa -aa -aa -aa -QC -rZ -MS -dw -QC -TB -TB -TB -TB -TB -QC -Qi -oi -QC -JH -JH -JH -JH -JH -JH -uf -Sz -Fc -Js -Sz -Sz -Sz -qv -PD -dm -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(154,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jb -jl -js -iX -js -jJ -Zo -aa -aa -aa -aa -Ih -OM -mG -nl -pd -On -eO -EJ -QV -QV -Mo -Sx -Gs -Ow -aD -YU -uZ -oe -su -fw -ts -mD -WG -Zv -sE -bH -sE -Zv -VZ -Ya -aa -aa -aa -aa -QC -QC -QC -QC -QC -QC -QC -QC -QC -QC -QC -QC -PT -Rh -QC -JH -JH -JH -JH -JH -JH -uf -uf -uf -Rr -Mv -Mv -Mv -uf -Bn -lG -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(155,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -iF -iN -iX -iX -jm -jr -iX -jr -jK -Ih -Ih -Ih -Ih -iN -iF -Pg -mH -nm -TO -On -Ui -Cs -Hz -oB -ZF -YU -xy -Or -UI -YU -uY -oe -su -xf -ts -mD -cm -bH -bH -bH -sE -sE -Vu -Ya -aa -aa -aa -aa -QC -PY -QC -oE -MK -pI -ZM -ru -tG -ru -tG -co -ED -oi -QC -JH -JH -JH -JH -JH -JH -JH -JH -uf -Sz -Js -Js -Sz -uf -uf -uf -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(156,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -iF -iO -iO -jc -jn -iP -jy -jD -jL -jc -jc -jc -iO -iO -iX -md -iR -nn -yP -On -On -On -pa -On -On -YU -YU -Rj -kR -YU -oe -qR -wA -fw -ts -mD -Wd -bH -RV -Sq -gX -sE -yS -Ya -aa -aa -aa -aa -Sp -Pc -Sp -Qi -oi -pI -Qv -FZ -gE -FZ -gE -FZ -gE -cq -ZR -JH -JH -JH -JH -JH -JH -JH -JH -uf -Sz -Js -Js -Sz -Wn -zA -uf -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +(158,1,1) = {" aa aa aa @@ -52455,8 +53251,6 @@ aa aa aa aa -"} -(157,1,1) = {" aa aa aa @@ -52568,6 +53362,19 @@ aa aa aa aa +pa +SK +SK +SK +SK +SK +pa +SK +SK +SK +SK +SK +pa aa aa aa @@ -52582,83 +53389,57 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa +SK aa aa aa aa aa aa -iF -iP -iP -jd -jo -jt -jt -jt -jM -jP -kj -kj -jD -jD -iX -me -mI -lo -nG -iF -yd -GL -jt -FO -Tq -YU -Sh -Ps -QY -YU -va +mD +vb oe su -fw +xk ts mD -gw +Vg +bH +bH bH -bA -bj -Pt sE -FB +sE +IK Ya aa aa aa aa QC +Hm Sl +Qi +oi QC -PT -Nl -QC -QC -at -QC -QC -QC -DF -QC -QC +aM +BW +Rx +NH +Tp +Yu +VT +Op QC JH JH @@ -52674,7 +53455,7 @@ Js Js Sz Wn -ga +zA uf uf aa @@ -52713,239 +53494,7 @@ aa aa aa "} -(158,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -iF -iQ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -ln -iN -zn -iR -lo -Vw -iF -hz -mi -pj -nm -XA -Sx -Nn -yi -cL -YU -vb -oe -su -xk -ts -mD -Vg -bH -bH -bH -sE -sE -IK -Ya -aa -aa -aa -aa -QC -Hm -Sl -Qi -oi -QC -aM -BW -Rx -NH -Tp -Yu -VT -Op -QC -JH -JH -JH -JH -JH -JH -JH -JH -uf -Sz -Js -Js -Sz -Wn -zA -uf -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +(159,1,1) = {" aa aa aa @@ -52969,8 +53518,6 @@ aa aa aa aa -"} -(159,1,1) = {" aa aa aa @@ -53072,16 +53619,19 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa @@ -53096,51 +53646,25 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa +SK aa aa aa aa aa aa -iF -BD -oJ -Qx -iO -oJ -iO -oJ -iO -oJ -iO -uG -oJ -lo -lJ -hz -iR -lo -hz -lJ -hz -iR -oJ -lo -Vy -YU -hY -ql -cA -YU +mD va oe wB @@ -53352,52 +53876,52 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +SK +aa +aa +aa +aa +aa +SK +aa +aa +aa +aa +SK +aa +aa +aa +aa iF -pP -oJ -Qx -BJ -oJ -my -oJ -EO -oJ -FW -uG -oJ -Kb -iF -XA -mJ -lq -XK -iF -os -iR -oJ -lo -qn -YU -YU -YU -YU -YU +io +mD mD mD wu @@ -53609,48 +54133,48 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +SK +aa +aa +aa +aa +aa +SK +aa +aa +aa +aa +SK +aa +aa iF -fd -oJ -Qx -dy -oJ -jp -oJ -TX -oJ -al -uG -oJ -EK -iF -iF -iF -uH -iF -iN -ot -mI -oJ -nn -qo -iN iF iF rK @@ -53682,7 +54206,7 @@ QC Zj bi ni -zw +QC Id Bs di @@ -53866,47 +54390,47 @@ aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa +SK aa aa aa aa aa aa -iF -ob -oJ -Qx -dy -oJ -Yk -oJ -UT -oJ -mm -uG -oJ -lp -iF -CP -kj -kj -nm -iF -ou -iR -oJ -lo -oM +aa +aa +aa +aa +aa +aa +aa +aa +SK +aa +aa +aa +aa +aa +SK +aa +aa +aa +aa +SK +aa +aa iF rF iF @@ -53938,7 +54462,7 @@ hn QC bf eI -ch +bi ck BW uv @@ -54107,6 +54631,7 @@ aa aa aa aa +yV aa aa aa @@ -54122,48 +54647,47 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SK aa aa aa aa iF -kp -bh -bh -oJ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -oJ -lo -uH -wM -oJ -oJ -lo -lK -hz -oN -iZ -lq -zh +iF +iF +iF +iF +iF +iF +Sy +iF +iF +iF +iF +iF +iF +iF +iF +Ih +Ih +Ih +Ih +Ih +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF iF iX iF @@ -54193,9 +54717,9 @@ QC at QC QC -QC -QC -QC +FR +bi +No QC Wv Kd @@ -54254,40 +54778,8 @@ aa aa aa aa -"} -(164,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +"} +(164,1,1) = {" aa aa aa @@ -54392,36 +54884,68 @@ aa aa aa aa +iX +jk +jr +iX +jr +jI +Ih aa aa aa aa +Ih +Ih iF -iS -KR -pA -jq -ju -ju -mF -jN -jQ -jN -pL -sb -QG iF -mj -jf -iZ -nJ iF -ov -oO -do -hz -WS -qS +iF +aa +aa +aa +AJ +aa +aa +aa +aa +iF +wM +wM +vn +wM +wM +wM +wM +vn +wM +wM +wM +wM +vn +wM +wM +cf +cf +cf +cf +cf +wM +wM +vn +wM +wM +wM +wM +vn +wM +wM +wM +wM +vn +wM +wM +wM Nx ZX tK @@ -54451,8 +54975,8 @@ gE oj QC Xf -XJ -Xf +No +bi QC Je Kd @@ -54617,68 +55141,68 @@ aa aa aa aa +jb +jl +js +iX +js +jJ +Zo aa aa aa aa +Ih +OM +mG +nl +pd +iF aa aa aa +SK aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -iF -iF -iN -iF -iF -iF -iF -iF -Ih iF +wM iF iF -iN iF iF iF iF -no iF iF -iN -Ih -pl -pQ -Ih iF +Vx +Vx +Vx +Vx +Vx +lU +lU +lU +lU +lU +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx +Vx iX iF UN @@ -54707,9 +55231,9 @@ bd Rh Ag QC -Sl -Sl -Sl +QC +QC +QC QC hJ Kd @@ -54871,43 +55395,43 @@ aa aa aa aa +iF +iN +iX +iX +jm +jr +iX +jr +jK +Ih +Ih +Ih +Ih +iN +iF +Gz +mH +nm +TO +iF aa aa aa +SK aa aa aa aa +iF +wM +iF aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SK aa aa Vx @@ -55128,43 +55652,43 @@ aa aa aa aa +iF +iO +iO +jc +jn +iP +jy +jD +jL +jc +jc +jc +iO +iO +iX +md +iR +nn +yP +iF +iF +iF +iF +iF +iF +iF aa aa +iF +wM +iF aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SK aa aa Vx @@ -55385,43 +55909,43 @@ aa aa aa aa +iF +iP +iP +jd +jo +jt +jt +jt +jM +jP +kj +kj +jD +jD +iX +me +mI +lo +nG +iF +yd +GL +jt +FO +Tq +iF aa aa +iF +by +iF aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SK aa aa Vx @@ -55642,43 +56166,43 @@ aa aa aa aa +iF +iQ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +ln +iN +zn +iR +lo +Vw +iF +hz +mi +pj +nm +XA +iF aa aa +iF +wM +iF aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +AJ aa aa Vx @@ -55899,15 +56423,125 @@ aa aa aa aa +iF +BD +oJ +Qx +iO +oJ +iO +oJ +iO +oJ +iO +uG +oJ +lo +lJ +hz +iR +lo +hz +lJ +hz +iR +oJ +lo +Uq +iF aa aa +iF +wM +iF aa aa aa aa aa +SK aa aa +Vx +Wj +Lr +Cn +OI +uR +uR +uR +uR +uR +uR +uR +uR +Vx +if +Jg +mM +Ox +Ox +Ox +Ox +Ox +Ox +Ox +qs +tI +rI +Jg +tN +Ab +LT +Ng +xD +xD +xD +VW +Cb +vt +xo +mk +BE +iu +CK +Ab +Ab +Ab +DW +iu +WK +Mu +Mu +Mu +aB +zw +BW +BW +NV +QC +yY +Kd +yY +SZ +It +It +It +It +It +It +It +It +It +It +Pj +kd +kd +Sz +qd +Wn +wj +uf aa aa aa @@ -55938,155 +56572,13 @@ aa aa aa aa -Vx -Wj -Lr -Cn -OI -uR -uR -uR -uR -uR -uR -uR -uR -Vx -if -Jg -mM -Ox -Ox -Ox -Ox -Ox -Ox -Ox -qs -tI -rI -Jg -tN -Ab -LT -Ng -xD -xD -xD -VW -Cb -vt -xo -mk -BE -iu -CK -Ab -Ab -Ab -DW -iu -WK -Mu -Mu -Mu -aB -zw -BW -BW -NV -QC -yY -Kd -yY -SZ -It -It -It -It -It -It -It -It -It -It -Pj -kd -kd -Sz -qd -Wn -wj -uf -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(171,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa aa aa +"} +(171,1,1) = {" aa aa aa @@ -56188,11 +56680,43 @@ aa aa aa aa +iF +pP +oJ +Qx +BJ +oJ +my +oJ +EO +oJ +FW +uG +oJ +Kb +iF +XA +mJ +lq +XK +iF +os +iR +oJ +lo +qn +iF +SK +SK +iF +wM +iF aa aa aa aa aa +SK aa aa Vx @@ -56413,43 +56937,43 @@ aa aa aa aa +iF +fd +oJ +Qx +dy +oJ +jp +oJ +TX +oJ +al +uG +oJ +EK +iF +iF +iF +uH +iF +iN +ot +mI +oJ +nn +qo +iN aa aa +iF +wM +iF aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SK aa aa Vx @@ -56670,37 +57194,37 @@ aa aa aa aa +iF +ob +oJ +Qx +dy +oJ +Yk +oJ +UT +oJ +mm +uG +oJ +lp +iF +CP +kj +kj +nm +iF +ou +iR +oJ +lo +oM +iF aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +iF +by +iF aa aa aa @@ -56727,11 +57251,11 @@ Jb Jb Mz il -Mz +nz bk Fo bk -Mz +nz io io io @@ -56763,9 +57287,9 @@ bd Rh Tn QC -Sl -Sl -Sl +QC +QC +QC QC hJ Kd @@ -56927,60 +57451,60 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +iF +kp +bh +bh +oJ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +oJ +lo +uH +wM +oJ +oJ +lo +lK +hz +oN +iZ +lq +zh +iF +iF +iF +iF +wM +iF +SK +SK +AJ +SK +SK Jb rs -cK +ze Dj rs -LS +ze Dj rs -JI +ze Dj rs -dO +ze Dj rs -Ky +ze Dj rs -bS +ze Jb uj il @@ -56990,10 +57514,10 @@ nM nM nM io -bp -eP Vc -YA +Vc +Vc +io tN Ab mR @@ -57021,8 +57545,8 @@ Vs RO QC XJ -Xf -XJ +cS +cS QC hS Kd @@ -57184,37 +57708,37 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +iF +iS +KR +pA +jq +ju +ju +mF +jN +jQ +jN +pL +sb +QG +iF +mj +jf +iZ +nJ +iF +ov +oO +do +hz +WS +qS +wM +ij +wM +wM +iF aa aa aa @@ -57241,15 +57765,15 @@ iB Jb iH il -Mz +nz GC Fo GC -Mz +nz io -TU -WP -Ok +Vc +Vc +Vc io tO tN @@ -57277,9 +57801,9 @@ QC at QC QC -QC -QC -QC +XJ +cS +cS QC BW Kd @@ -57441,37 +57965,37 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +iF +iF +iN +iF +iF +iF +iF +iF +Ih +iF +iF +iF +iN +iF +iF +iF +iF +iF +iF +iF +iN +Ih +pl +pQ +Ih +iF +iF +iF +iF +iF +iF aa aa aa @@ -57524,7 +58048,7 @@ rK io iu io -NJ +Qs Ti aX iu @@ -57536,7 +58060,7 @@ dX QC cW cS -nj +cS ck BW gx @@ -57556,7 +58080,7 @@ Pj Na Sz Sz -IY +uL uf aa aa @@ -57781,7 +58305,7 @@ nk Ye pO iu -BV +Qs SN ph iu @@ -57794,7 +58318,7 @@ QC dV cS RC -zw +QC Ot Ot di @@ -58010,11 +58534,11 @@ il il il il -Mz -Ho -Mz -Mz -Mz +nz +wU +nz +nz +nz jw pm io @@ -58038,7 +58562,7 @@ iu iu iu io -lT +Qs bc io io @@ -58271,7 +58795,7 @@ mS lL hW nY -Mz +nz jw jG iu @@ -58785,7 +59309,7 @@ mT lL hW oa -Mz +nz jw jG iu @@ -59038,11 +59562,11 @@ il il il il -Mz -Ho -Mz -Mz -Mz +nz +wU +nz +nz +nz jw pm io @@ -59294,7 +59818,7 @@ Us tR Qp lL -Ra +cB kB lL iL @@ -59811,11 +60335,11 @@ iB Jb pc Hv -RI +Ov ja et ja -RI +Ov io io io @@ -60058,10 +60582,10 @@ Zd ze Dj Zd -Vf +ze Dj Zd -yl +ze Dj Zd DS @@ -61867,7 +62391,7 @@ ps Zx Ez GT -RI +Ov ps rk rk @@ -62381,7 +62905,7 @@ rk rk rk rk -RI +Ov MV mY rM @@ -62632,13 +63156,13 @@ pc qc rk kE -lb +Me rk rM mn mY rk -RI +Ov MV mY rM @@ -62895,7 +63419,7 @@ rM mo mY rk -RI +Ov MV mY rM @@ -63409,7 +63933,7 @@ rM mo mY rk -RI +Ov MV mY rM @@ -63666,7 +64190,7 @@ rM mn mY rk -RI +Ov MV mY rM @@ -63691,8 +64215,8 @@ aP cg qz cg -Nh -Ro +Ww +Ww Ww Yn Se @@ -63923,7 +64447,7 @@ rk rk rk rk -RI +Ov MV mY rM @@ -63949,8 +64473,8 @@ fm Cd cg MI -Hw -DQ +vh +vh Yn Se Si @@ -64205,9 +64729,9 @@ AW cg xb cg -OD -Hw -DQ +vh +vh +Ww Yn Se Si @@ -64437,7 +64961,7 @@ lV lW lW lV -RI +Ov ps rk rk @@ -64459,12 +64983,12 @@ tU tU tU Bc -ag +DK vM DK -sa -Hw -DQ +vh +Ww +vh Yn Se Se @@ -64719,9 +65243,9 @@ Bd cg cg cg -Tj -mu -vY +vh +vh +Ww Yn Vk Vk From 3686e385211d3d49b07550c2ac38399d17724131 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 4 Oct 2023 10:09:44 -0600 Subject: [PATCH 03/21] duplicate deletion --- _maps/map_files/generic/CentCom.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 315a67a29154..8c122b4da0ce 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -146,9 +146,6 @@ "aO" = ( /obj/structure/window/plasma/spawner/directional/east, /obj/structure/window/plasma/spawner/directional/north, -/obj/machinery/clonepod{ - desc = "A seemingly older and different piece of technology that was capable of near perfect clones over much longer timeframes than now almost completely banned cloning vat technology.
The glass dome seems to be dirty and frosted over, obscuring the contents of the vat. The status and operating panel seems to have been hijacked, a familiar 'card' connected to its operations interface." - }, /obj/machinery/clonepod{ desc = "A seemingly older and different piece of technology that was capable of near perfect clones over much longer timeframes than now almost completely banned cloning vat technology.
The glass dome seems to be dirty and frosted over, obscuring the contents of the vat. The status and operating panel seems to have been hijacked, a familiar 'card' connected to its operations interface."; name = "biovat" From 26184ff4cd5cb78420c8540d397bc08bb36e8644 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:32:47 -0600 Subject: [PATCH 04/21] magic mirror switcharoo just swapped in a magic mirror for the regular mirror so that can help account for instant race/gender/hair changes. --- _maps/map_files/generic/CentCom.dmm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 8c122b4da0ce..fdd4af54c483 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -10400,6 +10400,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"Qn" = ( +/obj/structure/mirror/magic, +/turf/closed/indestructible/riveted, +/area/centcom/tdome/observation) "Qp" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -12225,7 +12229,6 @@ /area/centcom/central_command_areas/evacuation) "Xl" = ( /obj/structure/sink/directional/north, -/obj/structure/mirror/directional/south, /turf/open/floor/iron/white, /area/centcom/tdome/observation) "Xm" = ( @@ -51635,7 +51638,7 @@ bi bi bi Xl -QC +Qn gT Vr pI From 3c93611a4e0dfe12bf5c09ee8868850087356f8a Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:44:14 -0600 Subject: [PATCH 05/21] moved things back to space whoops. missed a few areas. fixed. --- _maps/map_files/generic/CentCom.dmm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index fdd4af54c483..381c4ab0609a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11685,9 +11685,6 @@ /obj/machinery/fishing_portal_generator, /turf/open/floor/carpet/neon/simple/cyan, /area/centcom/central_command_areas/admin) -"Vc" = ( -/turf/open/space/basic, -/area/centcom/central_command_areas/control) "Vd" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, @@ -57514,9 +57511,9 @@ nM nM nM io -Vc -Vc -Vc +aa +aa +aa io tN Ab @@ -57771,9 +57768,9 @@ Fo GC nz io -Vc -Vc -Vc +aa +aa +aa io tO tN From 34f0e126ebc98a3948b80a2b13513eea89ed9eed Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:38:13 -0600 Subject: [PATCH 06/21] removed lattice just removing lattice until I can figure out why there's banned neighbors so I can do "decorations" --- _maps/map_files/generic/CentCom.dmm | 227 +++++++++++++--------------- 1 file changed, 106 insertions(+), 121 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 381c4ab0609a..5517e27f321b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3923,12 +3923,6 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) -"pa" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/obj/structure/marker_beacon/lime, -/turf/open/space/basic, -/area/space) "pc" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -6870,11 +6864,6 @@ "AH" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) -"AJ" = ( -/obj/structure/lattice, -/obj/structure/marker_beacon/lime, -/turf/open/space/basic, -/area/space) "AL" = ( /obj/structure/chair/office{ dir = 1 @@ -11052,10 +11041,6 @@ /obj/machinery/light/directional/east, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) -"SK" = ( -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "SM" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -51587,18 +51572,18 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa aa aa aa @@ -51844,18 +51829,18 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa aa aa aa @@ -52101,18 +52086,18 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa aa aa aa @@ -52331,19 +52316,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -52358,18 +52340,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa aa @@ -52588,19 +52573,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -52615,18 +52597,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa aa @@ -52845,19 +52830,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -52872,24 +52854,27 @@ aa aa aa aa -pa -SK -SK -SK -SK -SK -pa -SK -SK -SK -SK -pa -SK -SK -SK -SK -SK -SK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa mD oe qR @@ -53102,19 +53087,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -53129,18 +53111,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa aa @@ -53359,19 +53344,6 @@ aa aa aa aa -pa -SK -SK -SK -SK -SK -pa -SK -SK -SK -SK -SK -pa aa aa aa @@ -53386,18 +53358,31 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -53616,19 +53601,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -53643,18 +53625,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa aa @@ -53873,19 +53858,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -53900,18 +53882,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa aa @@ -54130,19 +54115,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -54157,18 +54139,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa iF @@ -54387,19 +54372,16 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa @@ -54414,18 +54396,21 @@ aa aa aa aa -SK aa aa aa aa aa -SK aa aa aa aa -SK +aa +aa +aa +aa +aa +aa aa aa iF @@ -54644,7 +54629,7 @@ aa aa aa aa -SK +aa aa aa aa @@ -54901,7 +54886,7 @@ iF aa aa aa -AJ +aa aa aa aa @@ -55158,7 +55143,7 @@ iF aa aa aa -SK +aa aa aa aa @@ -55415,7 +55400,7 @@ iF aa aa aa -SK +aa aa aa aa @@ -55428,7 +55413,7 @@ aa aa aa aa -SK +aa aa aa Vx @@ -55685,7 +55670,7 @@ aa aa aa aa -SK +aa aa aa Vx @@ -55942,7 +55927,7 @@ aa aa aa aa -SK +aa aa aa Vx @@ -56199,7 +56184,7 @@ aa aa aa aa -AJ +aa aa aa Vx @@ -56456,7 +56441,7 @@ aa aa aa aa -SK +aa aa aa Vx @@ -56703,8 +56688,8 @@ oJ lo qn iF -SK -SK +aa +aa iF wM iF @@ -56713,7 +56698,7 @@ aa aa aa aa -SK +aa aa aa Vx @@ -56970,7 +56955,7 @@ aa aa aa aa -SK +aa aa aa Vx @@ -57479,11 +57464,11 @@ iF iF wM iF -SK -SK -AJ -SK -SK +aa +aa +aa +aa +aa Jb rs ze From 7d6309b1067651c91f9cdb92c716fbf204984210 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:29:05 -0600 Subject: [PATCH 07/21] last missing lattice --- _maps/map_files/generic/CentCom.dmm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 5517e27f321b..16a2a192d88d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -10968,10 +10968,6 @@ /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/admin/storage) -"Sy" = ( -/obj/structure/lattice, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/supply) "Sz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -54641,7 +54637,7 @@ iF iF iF iF -Sy +iF iF iF iF From cb1c220ccc08e9fdabd5999e122b9df4a915c29d Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Fri, 6 Oct 2023 22:17:27 -0600 Subject: [PATCH 08/21] added offices added 80% offices for vicky and trapp, 40% office for softie. --- _maps/map_files/generic/CentCom.dmm | 691 ++++++++++++++++++++-------- 1 file changed, 499 insertions(+), 192 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 16a2a192d88d..ffdec38de8bf 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -176,6 +176,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"aW" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "aX" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/machinery/computer/cloning{ @@ -569,6 +575,11 @@ /obj/effect/mapping_helpers/airlock/access/any/security/brig, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"cC" = ( +/obj/structure/closet/crate/bin, +/obj/structure/light_prism, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "cD" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -590,6 +601,11 @@ }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) +"cH" = ( +/obj/structure/table/wood/fancy/purple, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "cJ" = ( /obj/docking_port/stationary{ dir = 4; @@ -612,6 +628,12 @@ /obj/item/storage/box/fish_debug, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"cM" = ( +/obj/structure/chair/sofa/middle/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "cO" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -729,6 +751,11 @@ }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) +"dt" = ( +/obj/structure/window/reinforced/tinted/frosted, +/obj/structure/closet/mini_fridge, +/turf/open/floor/iron/dark/small, +/area/centcom/central_command_areas/admin) "dv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -776,6 +803,12 @@ }, /turf/open/floor/iron/white, /area/centcom/tdome/observation) +"dC" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 8 + }, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "dG" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks{ @@ -822,6 +855,10 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron, /area/centcom/tdome/observation) +"dP" = ( +/obj/machinery/dna_scannernew, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "dQ" = ( /obj/structure/sign/poster/contraband/tipper_cream_soda{ pixel_y = 35 @@ -959,17 +996,6 @@ }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) -"et" = ( -/obj/effect/spawner/structure/window/reinforced{ - max_integrity = 1800 - }, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/central_command_areas/courtroom) "ex" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -1173,6 +1199,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"fl" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "fm" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -1180,10 +1213,6 @@ "fo" = ( /turf/open/floor/iron/smooth, /area/centcom/central_command_areas/prison) -"fp" = ( -/obj/item/kirbyplants/photosynthetic, -/turf/open/floor/grass/fairy, -/area/centcom/central_command_areas/admin) "fw" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -1306,6 +1335,10 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/space/basic, /area/space/nearstation) +"fU" = ( +/obj/machinery/modular_computer/console/preset/id/centcom, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "fV" = ( /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) @@ -1411,6 +1444,10 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"go" = ( +/obj/structure/closet, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "gp" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -1882,6 +1919,13 @@ /obj/effect/turf_decal/trimline/dark_red/corner, /turf/open/floor/iron/smooth_corner, /area/centcom/central_command_areas/prison) +"iq" = ( +/obj/machinery/computer/records/security/laptop{ + dir = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "ir" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/prison/cells) @@ -2610,12 +2654,24 @@ /obj/machinery/telecomms/allinone/nuclear, /turf/open/indestructible/hierophant, /area/centcom/central_command_areas/admin) +"ki" = ( +/obj/structure/table/wood/fancy/purple, +/obj/machinery/computer/records/security/laptop, +/obj/item/spellbook_charge/debug, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "kj" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"kl" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "kn" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/microwave, @@ -2640,6 +2696,13 @@ /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/ghost_spawn) +"kv" = ( +/obj/machinery/door/airlock/centcom{ + name = "Waffles' Den" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "kx" = ( /obj/structure/filingcabinet/medical, /obj/effect/turf_decal/stripes/line{ @@ -3095,6 +3158,12 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) +"ma" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv, +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "md" = ( /obj/machinery/computer/shuttle/labor, /obj/effect/turf_decal/stripes/line{ @@ -3113,6 +3182,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"mh" = ( +/obj/structure/bed, +/obj/item/bedsheet/centcom, +/obj/item/toy/plush/lizard_plushie/green, +/turf/open/floor/iron/dark/small, +/area/centcom/central_command_areas/admin) "mi" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 @@ -3691,6 +3766,11 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) +"om" = ( +/obj/effect/grand_rune/finale, +/obj/structure/chair/old, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "on" = ( /obj/docking_port/stationary{ dir = 4; @@ -4012,6 +4092,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"pt" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/fax, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "pu" = ( /obj/item/food/spaghetti/copypasta{ name = "Spaghetti Code"; @@ -4019,6 +4104,11 @@ }, /turf/open/ai_visible, /area/centcom/ai_multicam_room) +"pv" = ( +/obj/effect/rune/narsie, +/obj/structure/chair/comfy/carp, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "pw" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/machinery/vending/imported/yangyu, @@ -4386,6 +4476,14 @@ /obj/effect/mapping_helpers/airlock/access/any/security/armory, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"qN" = ( +/obj/structure/table/wood/fancy/purple, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/item/scrying, +/obj/item/mod/control/pre_equipped/enchanted, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "qR" = ( /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, @@ -4451,6 +4549,10 @@ /obj/structure/statue/silver/janitor, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"rh" = ( +/obj/structure/light_prism, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "rk" = ( /turf/open/floor/wood, /area/centcom/central_command_areas/courtroom) @@ -4468,6 +4570,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"ro" = ( +/obj/structure/window/reinforced/tinted/frosted, +/turf/open/floor/iron/dark/small, +/area/centcom/central_command_areas/admin) "rs" = ( /obj/effect/landmark/prisonwarp, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -4676,6 +4782,10 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"se" = ( +/obj/structure/table/reinforced, +/turf/open/floor/circuit/green, +/area/centcom/central_command_areas/admin) "sf" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 4 @@ -4814,6 +4924,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"sI" = ( +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "sJ" = ( /obj/machinery/vending/coffee, /obj/machinery/newscaster/directional/south, @@ -5243,6 +5356,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"uh" = ( +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "uj" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -5260,6 +5376,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"un" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "up" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, @@ -5281,6 +5401,11 @@ }, /turf/open/space/basic, /area/space) +"uu" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "uv" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -5723,6 +5848,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"wb" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "wg" = ( /obj/structure/closet/secure_closet/ert_com, /obj/structure/sign/directions/command{ @@ -5768,6 +5897,12 @@ }, /turf/open/floor/elevated, /area/centcom/central_command_areas/fore) +"wp" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "wr" = ( /obj/structure/chair{ dir = 4 @@ -5920,15 +6055,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) -"wQ" = ( -/obj/structure/water_source/puddle, -/mob/living/basic/frog, -/obj/structure/window/spawner/directional/north, -/obj/structure/window/spawner/directional/south, -/obj/structure/window/spawner/directional/east, -/obj/structure/window/spawner/directional/west, -/turf/open/floor/grass/fairy, -/area/centcom/central_command_areas/admin) "wR" = ( /obj/machinery/vending/wardrobe/medi_wardrobe{ default_price = 0; @@ -5961,6 +6087,10 @@ /obj/effect/mapping_helpers/airlock/access/any/security/armory, /turf/open/floor/iron, /area/centcom/central_command_areas/prison) +"wV" = ( +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "wW" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -6257,6 +6387,9 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supplypod) +"yg" = ( +/turf/open/floor/circuit/green, +/area/centcom/central_command_areas/admin) "yh" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -6350,6 +6483,9 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"yC" = ( +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "yE" = ( /obj/structure/chair/sofa/bench{ dir = 8 @@ -6380,10 +6516,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) -"yM" = ( -/obj/item/kirbyplants, -/turf/open/floor/grass/fairy, -/area/centcom/central_command_areas/admin) "yO" = ( /obj/machinery/computer/communications, /obj/machinery/status_display/evac/directional/north, @@ -6401,10 +6533,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"yQ" = ( -/obj/structure/flora/tree/jungle/style_3, -/turf/open/floor/grass/fairy, -/area/centcom/central_command_areas/admin) +"yR" = ( +/obj/effect/spawner/structure/window/reinforced/indestructible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/courtroom) "yS" = ( /obj/structure/table/reinforced, /obj/item/storage/box/emps, @@ -6684,6 +6816,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) +"zQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/purple, +/area/centcom/central_command_areas/admin) "zT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/light/floor/has_bulb, @@ -6697,10 +6835,21 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"zX" = ( +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) +"zY" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "zZ" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) +"Aa" = ( +/obj/structure/closet, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "Ab" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -6746,6 +6895,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"Aj" = ( +/obj/structure/weightmachine/stacklifter, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "Am" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -6885,6 +7038,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"AR" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/dice/d20, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "AS" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/royalblue, @@ -7306,6 +7464,10 @@ "Cb" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/ghost_spawn) +"Cc" = ( +/obj/structure/chair/comfy/shuttle, +/turf/open/floor/circuit/green, +/area/centcom/central_command_areas/admin) "Cd" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -7546,6 +7708,16 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/white, /area/centcom/central_command_areas/evacuation/ship) +"Dh" = ( +/obj/structure/bookcase, +/obj/item/book/granter/action/spell/random, +/obj/item/storage/book/bible, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/random, +/obj/item/book/random, +/obj/item/book/random, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "Di" = ( /turf/closed/indestructible/riveted, /area/centcom/ai_multicam_room) @@ -7700,6 +7872,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"DM" = ( +/obj/machinery/door/window{ + dir = 8 + }, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "DS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /mob/living/basic/butterfly, @@ -7958,17 +8136,6 @@ }, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) -"Fo" = ( -/obj/effect/spawner/structure/window/reinforced{ - max_integrity = 1800 - }, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS" - }, -/turf/open/floor/plating, -/area/centcom/central_command_areas/prison) "Fq" = ( /obj/structure/sign/warning/secure_area, /turf/closed/indestructible/riveted, @@ -8067,6 +8234,13 @@ /obj/machinery/vending/dinnerware, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"FS" = ( +/obj/machinery/computer/records/medical/laptop{ + dir = 4 + }, +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "FT" = ( /obj/structure/table/wood, /obj/effect/spawner/random/bureaucracy/folder, @@ -8106,6 +8280,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"Gb" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4 + }, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "Gc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -8174,6 +8354,13 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"Gt" = ( +/obj/machinery/door/airlock/centcom{ + name = "Master Trapp's Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "Gy" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -8308,6 +8495,11 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"GY" = ( +/obj/structure/table/wood/fancy/purple, +/obj/machinery/fax, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "GZ" = ( /obj/machinery/door/airlock/centcom{ dir = 4 @@ -8331,6 +8523,21 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/smooth_edge, /area/centcom/central_command_areas/evacuation/ship) +"Hc" = ( +/obj/structure/closet, +/obj/item/food/cake/birthday{ + name = "70th Cake"; + desc = "When no one was looking, Vicky Hudson stole 70 cakes, that is as many as seven tens and that's terrible." + }, +/obj/item/dice/d6, +/obj/item/dice/d6, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) +"He" = ( +/obj/structure/table/wood, +/obj/item/toy/plush/lizard_plushie, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Hf" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -8540,6 +8747,10 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/centcom/central_command_areas/fore) +"In" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "Io" = ( /obj/docking_port/stationary{ dir = 8; @@ -8759,6 +8970,12 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Jv" = ( +/obj/machinery/door/window{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/purple, +/area/centcom/central_command_areas/admin) "Jy" = ( /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -8858,6 +9075,10 @@ /obj/effect/spawner/random/bureaucracy/pen, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"Kc" = ( +/obj/structure/table/reinforced, +/turf/open/floor/mineral/titanium/purple, +/area/centcom/central_command_areas/admin) "Kd" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -9293,6 +9514,10 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"LL" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "LM" = ( /obj/docking_port/stationary{ dir = 8; @@ -9376,6 +9601,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"Mb" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Me" = ( /obj/structure/table/wood, /obj/machinery/door/window{ @@ -9397,6 +9626,12 @@ /obj/item/statuebust, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"Mk" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4 + }, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "Mn" = ( /obj/structure/table/wood/fancy/red, /obj/effect/spawner/random/food_or_drink/pizzaparty, @@ -9468,6 +9703,12 @@ }, /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) +"ME" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "MF" = ( /obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -9570,6 +9811,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"Nc" = ( +/obj/structure/chair/office{ + dir = 1; + name = "gamer chair" + }, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Ne" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/trophy/gold_cup, @@ -9622,6 +9870,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Ns" = ( +/obj/structure/dresser, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "Nt" = ( /obj/machinery/light/directional/north, /turf/open/floor/wood, @@ -9828,10 +10080,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) -"Ou" = ( -/obj/item/kirbyplants/fern, -/turf/open/floor/grass/fairy, -/area/centcom/central_command_areas/admin) "Ov" = ( /obj/effect/spawner/structure/window/reinforced{ max_integrity = 1800 @@ -9880,6 +10128,13 @@ }, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"OD" = ( +/obj/machinery/clonepod{ + name = "First Success"; + desc = "A little known fact is that clones requires souls, the men and woman who worked on the first success of what would come to be known as the Iden Project did not know that." + }, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "OE" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -10081,6 +10336,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"Pl" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/dice/d10, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "Pm" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -10322,6 +10582,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"PZ" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/machinery/pollution_scrubber, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "Qb" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -10537,6 +10804,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod) +"QP" = ( +/obj/effect/heretic_rune/big, +/obj/structure/chair/musical, +/turf/open/floor/plating/abductor, +/area/centcom/central_command_areas/admin) "QQ" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/dark_red/filled/line, @@ -10850,6 +11122,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) +"RY" = ( +/obj/structure/punching_bag, +/turf/open/floor/grass/fairy, +/area/centcom/central_command_areas/admin) "Sb" = ( /turf/open/floor/wood, /area/centcom/tdome/observation) @@ -11401,6 +11677,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin/storage) +"Uc" = ( +/obj/effect/spawner/structure/window/reinforced/indestructible, +/turf/open/floor/plating, +/area/centcom/central_command_areas/prison) "Ud" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -11666,6 +11946,10 @@ /obj/machinery/fishing_portal_generator, /turf/open/floor/carpet/neon/simple/cyan, /area/centcom/central_command_areas/admin) +"Vc" = ( +/obj/structure/table/reinforced, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "Vd" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, @@ -12048,6 +12332,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"WH" = ( +/obj/machinery/door/window/brigdoor/security{ + dir = 1 + }, +/turf/open/floor/circuit/telecomms, +/area/centcom/central_command_areas/admin) "WI" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -12326,6 +12616,12 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"XR" = ( +/obj/structure/table/wood, +/obj/machinery/light/small/directional/west, +/obj/item/toy/plush/lizard_plushie, +/turf/open/floor/iron/grimy, +/area/centcom/central_command_areas/admin) "XS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -12482,6 +12778,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"Yz" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_id = Waffles; + fax_name = Waffles' Fax Machine + }, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/admin) "YD" = ( /obj/structure/table/wood, /obj/structure/reagent_dispensers/beerkeg, @@ -12589,6 +12893,9 @@ /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/fore) +"Zc" = ( +/turf/open/floor/iron/dark/small, +/area/centcom/central_command_areas/admin) "Zd" = ( /obj/effect/landmark/prisonwarp, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -43071,9 +43378,9 @@ cF cF Et Et -yM Et -Ou +Et +Et cF cF cF @@ -43327,9 +43634,9 @@ cF cF cF Et +Aj Et -yQ -Et +un Et cF cF @@ -43585,8 +43892,8 @@ cF cF Et Et +RY Et -wQ Et cF cF @@ -43825,7 +44132,7 @@ aa aa aa aa -aa +On On On On @@ -43844,7 +44151,7 @@ Et Et Et Et -fp +Et cF cF cF @@ -44082,14 +44389,14 @@ aa aa aa aa -aa On -Tx -gf -uD -pi -pi -pi +Gb +iq +FS +pt +dP +yC +zY On cF cF @@ -44339,14 +44646,14 @@ aa aa aa aa -aa Zf -pi -pi -eU -XN -pi -pi +ME +yg +Cc +AR +yC +yg +yg On Dx cF @@ -44596,14 +44903,14 @@ aa aa aa aa -aa Zf -pi -XN -NK -XN -pi -pi +OD +yg +yg +Pl +yC +yC +yg CS cF cF @@ -44853,14 +45160,14 @@ aa aa aa aa -aa Zf -pi -pi -pi -pi -pi -pi +wV +yg +yg +In +yg +yC +yC IS cF cF @@ -45110,14 +45417,14 @@ aa aa aa aa -aa On -Ly -oT -SI -SI -pi -cv +go +yC +yC +WH +yg +yg +Hc On cF cF @@ -45367,7 +45674,7 @@ aa aa aa aa -aa +On On On On @@ -45626,12 +45933,12 @@ aa aa aa On -Tx -gf -uD -pi -pi -pi +fU +Nc +XR +He +XR +LL On cF cF @@ -45651,12 +45958,12 @@ cF cF cF On -pi -pi -pi -uD -gf -Hp +rh +zX +zX +cH +ki +Mk On aa aa @@ -45883,12 +46190,12 @@ aa aa aa Zf -pi -pi -eU -XN -pi -pi +uu +QV +QV +QV +QV +QV On Dx cF @@ -45908,12 +46215,12 @@ cF cF cF IS -pi -pi -XN -eU -pi -pi +zX +QP +zX +zX +zX +zX Zf aa aa @@ -46140,13 +46447,13 @@ aa aa aa Zf -pi -XN -NK -XN -pi -pi -CS +Ns +QV +wp +cM +kl +QV +kv cF cF cF @@ -46164,13 +46471,13 @@ cF cF cF cF -CS -pi -pi -XN -NK -JC -pi +Gt +zX +zX +zX +pv +zX +rh Zf aa aa @@ -46397,12 +46704,12 @@ aa aa aa Zf -pi -pi -pi -pi -pi -pi +Zc +ro +sI +sI +sI +QV IS cF cF @@ -46422,12 +46729,12 @@ cF cF Dx On -pi -pi -pi -pi -pi -pi +zX +om +zX +zX +zX +zX Zf aa aa @@ -46654,12 +46961,12 @@ aa aa aa On -Ly -oT -SI -SI -pi -cv +mh +dt +Yz +ma +PZ +Mb On cF cF @@ -46679,12 +46986,12 @@ cF cF Ig On -cv -pi -SI -SI -oT -Ly +cC +zX +zX +qN +GY +Dh On aa aa @@ -50271,7 +50578,7 @@ On On On On -GZ +fl IS On On @@ -50526,11 +50833,11 @@ pi pi cv On -SI -SI -pi -pi -cv +uh +wb +uh +zQ +Kc On aa aa @@ -50783,11 +51090,11 @@ pi pi pi On -pi -pi -pi -pi -pi +uh +uh +uh +Jv +Kc On aa aa @@ -51040,11 +51347,11 @@ hw pi pi On -pi -hw -hw -pi -pi +uh +uh +uh +zQ +Kc On aa aa @@ -51297,11 +51604,11 @@ NK pi pi On -lQ -eU -NK -pi -pi +Vc +Vc +DM +se +yg On aa aa @@ -51554,11 +51861,11 @@ pi pi oT On -qa -pp -pi -pi -oT +uh +aW +uh +yg +yg On aa aa @@ -51811,11 +52118,11 @@ pi pi Ly On -Tx -pi -pi -pi -Ly +dC +Aa +Vc +se +yg On aa aa @@ -57229,11 +57536,11 @@ Jb Jb Mz il -nz +Uc bk -Fo +Uc bk -nz +Uc io io io @@ -57743,11 +58050,11 @@ iB Jb iH il -nz +Uc GC -Fo +Uc GC -nz +Uc io aa aa @@ -60313,11 +60620,11 @@ iB Jb pc Hv -Ov +yR ja -et +yR ja -Ov +yR io io io From a9d22096afda4c19f193d36af8d2bf64222ec64c Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 7 Oct 2023 10:14:32 -0600 Subject: [PATCH 09/21] abraxis office added abraxis' office. --- _maps/map_files/generic/CentCom.dmm | 175 +++++++++++++++++++++++----- 1 file changed, 143 insertions(+), 32 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index ffdec38de8bf..0b6454282440 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -606,6 +606,13 @@ /obj/machinery/computer/records/medical/laptop, /turf/open/floor/plating/abductor, /area/centcom/central_command_areas/admin) +"cI" = ( +/obj/machinery/door/airlock/centcom{ + name = "Abraxis' Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "cJ" = ( /obj/docking_port/stationary{ dir = 4; @@ -978,6 +985,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"eo" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/admin) "ep" = ( /obj/machinery/power/shuttle_engine/heater, /obj/effect/decal/cleanable/dirt, @@ -1151,6 +1163,10 @@ /obj/item/taperecorder, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/briefing) +"eW" = ( +/obj/structure/closet/secure_closet, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "eX" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -1809,6 +1825,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"hR" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/item/pizzabox/infinite, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "hS" = ( /obj/machinery/barsign/all_access/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -4284,6 +4305,11 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"qe" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/fax, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "qf" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -4324,6 +4350,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin/storage) +"qm" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/computer/records/security/laptop, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "qn" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/airalarm/directional/south, @@ -4800,6 +4831,10 @@ icon_state = "clown_carpet" }, /area/centcom/central_command_areas/fore) +"sh" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "sm" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/herringbone, @@ -5348,6 +5383,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"ue" = ( +/obj/structure/chair/sofa/corp/right, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "uf" = ( /turf/closed/indestructible/riveted, /area/centcom/tdome/administration) @@ -7026,6 +7065,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"AN" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) +"AP" = ( +/obj/machinery/nuclearbomb/beer, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "AQ" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -7638,6 +7686,10 @@ /obj/effect/spawner/random/engineering/tank, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"CR" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "CS" = ( /obj/machinery/door/airlock/centcom, /obj/effect/mapping_helpers/airlock/access/any/admin/captain, @@ -7730,6 +7782,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Dl" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "Dn" = ( /obj/structure/flora/tree/palm, /obj/machinery/light/directional/north, @@ -7899,6 +7957,11 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"Eb" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/item/storage/box/cups, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "Eg" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/public/glass{ @@ -8814,6 +8877,9 @@ /obj/structure/window/plasma/spawner/directional/east, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"ID" = ( +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/admin) "IE" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -8879,6 +8945,9 @@ /obj/machinery/door/poddoor/shutters/indestructible/preopen, /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/admin) +"IU" = ( +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "IX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -8947,6 +9016,11 @@ }, /turf/open/indestructible/event/plating, /area/centcom/tdome/arena/actual) +"Jo" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/item/book/manual/wiki/security_space_law, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "Jq" = ( /obj/machinery/camera/motion/thunderdome{ pixel_x = 10 @@ -9046,6 +9120,15 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"JQ" = ( +/obj/structure/table/reinforced/titaniumglass, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/item/stamp, +/obj/item/stamp/denied, +/obj/item/stamp/void, +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/admin) "JT" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/wood{ @@ -11410,6 +11493,12 @@ /obj/item/stack/sheet/mineral/plasma/five, /turf/open/floor/iron/smooth_edge, /area/centcom/central_command_areas/evacuation/ship) +"Tf" = ( +/obj/structure/chair/bronze{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/admin) "Tg" = ( /obj/item/storage/briefcase{ pixel_x = -3; @@ -12153,6 +12242,10 @@ /obj/item/storage/box/donkpockets, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"VU" = ( +/obj/structure/chair/comfy/carp, +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/admin) "VW" = ( /obj/machinery/light/directional/south, /turf/open/floor/wood, @@ -12582,6 +12675,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) +"XI" = ( +/obj/structure/table/abductor, +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/admin) "XJ" = ( /obj/structure/table/wood, /turf/open/floor/iron, @@ -12671,6 +12768,12 @@ /obj/machinery/computer/camera_advanced, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) +"Yj" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 4 + }, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "Yk" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/crate, @@ -12782,7 +12885,7 @@ /obj/structure/table/wood, /obj/machinery/fax{ fax_id = Waffles; - fax_name = Waffles' Fax Machine + fax_name = Waffles'FaxMachine }, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) @@ -12917,6 +13020,10 @@ /obj/structure/closet/crate/bin, /turf/open/floor/wood, /area/centcom/central_command_areas/admin) +"Zi" = ( +/obj/item/kirbyplants/fullysynthetic, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "Zj" = ( /obj/machinery/status_display/evac/directional/north, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -13021,6 +13128,10 @@ /obj/machinery/biogenerator/admin, /turf/open/indestructible/event/plating, /area/centcom/tdome/observation) +"ZD" = ( +/obj/structure/chair/sofa/corp/corner, +/turf/open/floor/mineral/titanium/white, +/area/centcom/central_command_areas/admin) "ZE" = ( /obj/effect/landmark/error, /turf/open/misc/ashplanet/wateryrock{ @@ -44416,12 +44527,12 @@ cF cF cF On -pi -pi -pi -uD -gf -Hp +hR +Eb +sh +AN +qm +Yj On aa aa @@ -44673,12 +44784,12 @@ cF cF cF IS -pi -pi -XN -eU -pi -pi +IU +ID +VU +JQ +Tf +IU Zf aa aa @@ -44929,13 +45040,13 @@ cF cF cF cF -CS -pi -pi -XN -NK -JC -pi +cI +IU +ID +VU +eo +ID +Zi Zf aa aa @@ -45187,12 +45298,12 @@ cF cF Dx On -pi -pi -pi -pi -pi -pi +ue +XI +ID +ID +ID +CR Zf aa aa @@ -45444,12 +45555,12 @@ cF cF cF On -cv -pi -SI -SI -oT -Ly +ZD +Dl +AP +eW +qe +Jo On aa aa From ab80bc26588d183bc113cba057bdeaacc2068e02 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 7 Oct 2023 11:37:16 -0600 Subject: [PATCH 10/21] quick fix on fax machines yes, adminsec is fucked at the moment. it is being fixed following. --- _maps/map_files/generic/CentCom.dmm | 2130 ++++++++++++++------------- 1 file changed, 1069 insertions(+), 1061 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 0b6454282440..f4d0d870dd6c 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -28,6 +28,9 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/sign/painting/library_secure{ + pixel_y = 32 + }, /turf/open/floor/wood, /area/centcom/central_command_areas/fore) "ar" = ( @@ -428,6 +431,9 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"bY" = ( +/turf/open/floor/iron, +/area/space) "ca" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/fullgrass/style_random, @@ -596,9 +602,6 @@ "cG" = ( /obj/structure/table/wood/fancy/red, /obj/item/storage/cans/sixsoda, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) "cH" = ( @@ -4307,7 +4310,10 @@ /area/centcom/tdome/administration) "qe" = ( /obj/structure/table/reinforced/titaniumglass, -/obj/machinery/fax, +/obj/machinery/fax{ + fax_name = "Cmdr. Abraxis"; + name = "Abraxis' Fax Machine" + }, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) "qf" = ( @@ -7559,6 +7565,10 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) +"Cr" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/closed/indestructible/riveted, +/area/centcom/central_command_areas/courtroom) "Cs" = ( /obj/machinery/modular_computer/console/preset/command{ dir = 8 @@ -8268,7 +8278,10 @@ /obj/structure/table/reinforced/plastitaniumglass{ name = "Andrea's Desk" }, -/obj/machinery/fax, +/obj/machinery/fax{ + fax_name = "Andrea's Desk"; + name = "Andrea's Fax Machine" + }, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) "FK" = ( @@ -8560,7 +8573,10 @@ /area/centcom/tdome/administration) "GY" = ( /obj/structure/table/wood/fancy/purple, -/obj/machinery/fax, +/obj/machinery/fax{ + name = "Trapp's Fax Machine"; + fax_name = "Trapp's Office" + }, /turf/open/floor/plating/abductor, /area/centcom/central_command_areas/admin) "GZ" = ( @@ -10682,6 +10698,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Qc" = ( +/turf/closed/indestructible/fakeglass, +/area/space) "Qd" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/drinkingglass{ @@ -11121,6 +11140,9 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) +"RD" = ( +/turf/closed/indestructible/riveted, +/area/space) "RF" = ( /obj/structure/table/reinforced, /obj/item/crowbar/red, @@ -12309,14 +12331,6 @@ /obj/effect/turf_decal/delivery, /turf/open/indestructible/event/plating, /area/centcom/tdome/arena/actual) -"Wi" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/door/airlock/public/glass{ - name = "CentCom Courtroom" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/courtroom) "Wj" = ( /obj/machinery/stove, /turf/open/floor/iron/kitchen/herringbone, @@ -12792,13 +12806,7 @@ /area/centcom/central_command_areas/supplypod) "Yo" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/door/airlock/public/glass{ - name = "CentCom Courtroom" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/floor/iron/dark, +/turf/closed/indestructible/riveted, /area/centcom/central_command_areas/evacuation) "Yp" = ( /obj/effect/turf_decal/siding/wideplating/dark{ @@ -12884,8 +12892,8 @@ "Yz" = ( /obj/structure/table/wood, /obj/machinery/fax{ - fax_id = Waffles; - fax_name = Waffles'FaxMachine + fax_name = "Waffles"; + name = "Waffles' Fax Machine" }, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) @@ -57626,32 +57634,32 @@ aa aa aa aa -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Mz -il -Uc -bk -Uc -bk -Uc +aa +aa +aa +RD +RD +RD +RD +RD +RD +RD +Qc +Qc +Qc +Qc +Qc +Qc +RD +RD +RD +RD +RD +RD +RD +RD +RD +RD io io io @@ -57883,37 +57891,37 @@ aa aa aa aa -Jb -rs -ze -Dj -rs -ze -Dj -rs -ze -Dj -rs -ze -Dj -rs -ze -Dj -rs -ze -Jb -uj -il -nM -nM -nM -nM -nM -io +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa io +bY +bY +bY +io tN Ab mR @@ -58140,37 +58148,37 @@ aa aa aa aa -Jb -ir -iB -YX -ir -iB -Jb -ir -iB -Jb -ir -iB -Jb -ir -iB -YX -ir -iB -Jb -iH -il -Uc -GC -Uc -GC -Uc -io +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa io +RD +RD +RD +io tO tN mR @@ -58397,95 +58405,95 @@ aa aa aa aa -il -is -lL -iJ -Zy -bu -jg -Zy -bu -jz -Zy -Zy -eQ -Zy -bu -kS -Qp -lL -Ra -kB -Km -iL -iT -iT -iT -ls -io -io -io -io -io -Fq -UO -io -io -yU -mk -yU -io -io -iu -iu -io -rK -io -iu -io -Qs -Ti -aX -iu -eM -ZM -Vs -tG -dX -QC -cW -cS -cS -ck -BW -gx -gx -SZ -It -It -It -It -It -It -It -It -It -It -Pj -Na -Sz -Sz -uL -uf -aa -aa -aa -aa -aa -aa -aa -aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +io +io +io +io +io +Fq +UO +io +io +yU +mk +yU +io +io +iu +iu +io +rK +io +iu +io +Qs +Ti +aX +iu +eM +ZM +Vs +tG +dX +QC +cW +cS +cS +ck +BW +gx +gx +SZ +It +It +It +It +It +It +It +It +It +It +Pj +Na +Sz +Sz +uL +uf +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -58654,32 +58662,32 @@ aa aa aa aa -iH -it -lL -im -Gc -gg -Gc -Gc -If -fo -jF -Gc -Gc -gg -Gc -rS -hb -lL -Ra -kB -lL -iK -iU -iU -jx -jG +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa iu Ym io @@ -58911,32 +58919,32 @@ aa aa aa aa -il -il -il -il -il -Ho -il -il -PQ -fo -FK -Mz -Mz -Ho -il -il -il -il -il -nz -wU -nz -nz -nz -jw -pm +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa io iu io @@ -59168,32 +59176,32 @@ aa aa aa aa -il -iv -iD -iD -iV -lL -bT -il -dY -ya -QQ -Mz -jU -lL -kx -kT -lu -lO -il -mS -lL -hW -nY -nz -jw -jG +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa iu Ym iu @@ -59425,32 +59433,32 @@ aa aa aa aa -il -iw -lL -lL -lL -lL -ji -il -kK -GE -nT -il -jT -lL -lL -lL -lL -lL -qL -lL -lL -Pq -nZ -il -jE -jG +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa iu lN iu @@ -59682,32 +59690,32 @@ aa aa aa aa -il -ix -iE -iE -iW -lL -jh -il -Oy -Uz -gV -Mz -jU -lL -ky -kU -lv -lP -il -mT -lL -hW -oa -nz -jw -jG +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa iu Ym iu @@ -59908,6 +59916,32 @@ aa aa aa aa +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Mz +il +Uc +bk +Uc +bk +Uc aa aa aa @@ -59939,32 +59973,6 @@ aa aa aa aa -il -il -il -il -il -Ho -il -il -PQ -fo -FK -Mz -Mz -Ho -il -il -il -il -il -nz -wU -nz -nz -nz -jw -pm io iu io @@ -60165,6 +60173,32 @@ aa aa aa aa +Jb +rs +ze +Dj +rs +ze +Dj +rs +ze +Dj +rs +ze +Dj +rs +ze +Dj +rs +ze +Jb +uj +il +nM +nM +nM +nM +nM aa aa aa @@ -60196,32 +60230,6 @@ aa aa aa aa -iH -iy -lL -ip -Us -bu -Us -Us -Ua -fo -jv -Us -Us -bu -Us -tR -Qp -lL -cB -kB -lL -iL -iT -iT -jH -jG iu qw iu @@ -60422,6 +60430,32 @@ aa aa aa aa +Jb +ir +iB +YX +ir +iB +Jb +ir +iB +Jb +ir +iB +Jb +ir +iB +YX +ir +iB +Jb +iH +il +Uc +GC +Uc +GC +Uc aa aa aa @@ -60453,32 +60487,6 @@ aa aa aa aa -il -iz -lL -iM -Sn -gg -jj -Sn -gg -jB -Sn -gg -jV -Sn -gg -kV -hb -lL -Ra -kB -Qr -iK -iU -iU -iU -lt iu zC iu @@ -60679,6 +60687,45 @@ aa aa aa aa +il +is +lL +iJ +Zy +bu +jg +Zy +bu +jz +Zy +Zy +eQ +Zy +bu +kS +Qp +lL +Ra +kB +Km +iL +iT +iT +iT +ls +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -60697,45 +60744,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Jb -ir -iB -YX -ir -iB -Jb -ir -iB -Jb -ir -iB -Jb -ir -iB -YX -ir -iB -Jb -pc -Hv -yR -ja -yR -ja -yR io io io @@ -60936,6 +60944,32 @@ aa aa aa aa +iH +it +lL +im +Gc +gg +Gc +Gc +If +fo +jF +Gc +Gc +gg +Gc +rS +hb +lL +Ra +kB +lL +iK +iU +iU +jx +jG aa aa aa @@ -60967,33 +61001,7 @@ aa aa aa aa -Jb -Zd -ze -Dj -Zd -ze -Dj -Zd -ze -Dj -Zd -ze -Dj -Zd -ze -Dj -Zd -DS -Jb -Vi -Af -qf -ps -ig -ps -yh -Hv +RD cg cg cg @@ -61193,6 +61201,32 @@ aa aa aa aa +il +il +il +il +il +Ho +il +il +PQ +fo +FK +Mz +Mz +Ho +il +il +il +il +il +nz +wU +nz +nz +nz +jw +pm aa aa aa @@ -61224,33 +61258,7 @@ aa aa aa aa -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -Jb -NW -rM -rM -rM -rM -rM -zc -pc +RD cg PL fm @@ -61450,6 +61458,32 @@ aa aa aa aa +il +iv +iD +iD +iV +lL +bT +il +dY +ya +QQ +Mz +jU +lL +kx +kT +lu +lO +il +mS +lL +hW +nY +nz +jw +jG aa aa aa @@ -61481,33 +61515,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -uN -ig -ps -Ai -ps -dZ -Hv -nS -rM -rM -rM -rM -rM -RG -Hv +RD cg cg cg @@ -61707,6 +61715,32 @@ aa aa aa aa +il +iw +lL +lL +lL +lL +ji +il +kK +GE +nT +il +jT +lL +lL +lL +lL +lL +qL +lL +lL +Pq +nZ +il +jE +jG aa aa aa @@ -61738,33 +61772,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -MQ -rk -kz -kX -lw -rk -AC -ps -rM -rM -rM -rM -rM -zc -Hv +RD Cd qz cg @@ -61964,6 +61972,32 @@ aa aa aa aa +il +ix +iE +iE +iW +lL +jh +il +Oy +Uz +gV +Mz +jU +lL +ky +kU +lv +lP +il +mT +lL +hW +oa +nz +jw +jG aa aa aa @@ -61995,33 +62029,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -YV -rk -kA -kY -lw -KC -Hv -Fk -gs -rw -qh -ps -ps -Wp -Hv +RD qz qy cg @@ -62221,6 +62229,32 @@ aa aa aa aa +il +il +il +il +il +Ho +il +il +PQ +fo +FK +Mz +Mz +Ho +il +il +il +il +il +nz +wU +nz +nz +nz +jw +pm aa aa aa @@ -62252,33 +62286,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -Hv -Bt -Hv -Hv -Hv -vu -Hv -Hv -Hv -Hv -pc -Pu -Pu -pc -Hv +RD qA Cd fm @@ -62478,6 +62486,32 @@ aa aa aa aa +iH +iy +lL +ip +Us +bu +Us +Us +Ua +fo +jv +Us +Us +bu +Us +tR +Qp +lL +cB +kB +lL +iL +iT +iT +jH +jG aa aa aa @@ -62509,33 +62543,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -bB -ps -Ss -pc -hP -lR -ml -mW -rN -bP -ps -ps -ps -dZ -Hv +RD qy qz cg @@ -62735,6 +62743,32 @@ aa aa aa aa +il +iz +lL +iM +Sn +gg +jj +Sn +gg +jB +Sn +gg +jV +Sn +gg +kV +hb +lL +Ra +kB +Qr +iK +iU +iU +iU +lt aa aa aa @@ -62766,33 +62800,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -NW -rM -rM -ct -ps -ps -Zx -Ez -GT -Ov -ps -rk -rk -ig -Hv +RD qy qz cg @@ -62992,6 +63000,32 @@ aa aa aa aa +Jb +ir +iB +YX +ir +iB +Jb +ir +iB +Jb +ir +iB +Jb +ir +iB +YX +ir +iB +Jb +pc +Hv +yR +ja +yR +ja +yR aa aa aa @@ -63023,33 +63057,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -pM -rM -kC -Hv -RI -nq -RI -RI -RI -Hv -bJ -mY -rM -OS -Hv +RD cg fm cg @@ -63249,6 +63257,33 @@ aa aa aa aa +Jb +Zd +ze +Dj +Zd +ze +Dj +Zd +ze +Dj +Zd +ze +Dj +Zd +ze +Dj +Zd +DS +Jb +Vi +Af +qf +ps +ig +ps +yh +Hv aa aa aa @@ -63279,34 +63314,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Hv -NW -rk -kD -la -rk -rk -rk -rk -rk -Ov -MV -mY -rM -RP -Hv +RD qB qW rT @@ -63506,6 +63514,33 @@ aa aa aa aa +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +Jb +NW +rM +rM +rM +rM +rM +zc +pc aa aa aa @@ -63536,34 +63571,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -pc -qc -rk -kE -Me -rk -rM -mn -mY -rk -Ov -MV -mY -rM -Np -Hv +RD qC qX rU @@ -63774,6 +63782,22 @@ aa aa aa aa +Hv +uN +ig +ps +Ai +ps +dZ +Hv +nS +rM +rM +rM +rM +rM +RG +Hv aa aa aa @@ -63804,23 +63828,7 @@ aa aa aa aa -aa -Hv -gR -rk -kF -lc -rk -rM -mo -mY -rk -Ov -MV -mY -rM -sJ -Hv +RD qD qY rV @@ -64031,6 +64039,22 @@ aa aa aa aa +Hv +MQ +rk +kz +kX +lw +rk +AC +ps +rM +rM +rM +rM +rM +zc +Hv aa aa aa @@ -64061,23 +64085,7 @@ aa aa aa aa -aa -pc -oD -rk -kG -ld -rk -rM -rM -rM -rk -TD -ps -rM -rM -Pk -Hv +RD cg fm cg @@ -64288,6 +64296,22 @@ aa aa aa aa +Hv +YV +rk +kA +kY +lw +KC +Hv +Fk +gs +rw +qh +ps +ps +Wp +Hv aa aa aa @@ -64318,23 +64342,7 @@ aa aa aa aa -aa -Hv -Pe -rk -kH -le -rk -rM -mo -mY -rk -Ov -MV -mY -rM -ML -pc +RD qz qy cg @@ -64545,53 +64553,53 @@ aa aa aa aa +Hv +Hv +Bt +Hv +Hv +Hv +vu +Hv +Hv +Hv +Hv +pc +Pu +Pu +pc +Hv aa aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -pc -BU -rk -kE -lb -rk -rM -mn -mY -rk -Ov -MV -mY -rM -Np -Hv +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +RD qy YI cg @@ -64802,6 +64810,22 @@ aa aa aa aa +Hv +bB +ps +Ss +pc +hP +lR +ml +mW +rN +bP +ps +ps +ps +dZ +Hv aa aa aa @@ -64832,23 +64856,7 @@ aa aa aa aa -aa -Hv -NW -rk -kD -lf -rk -rk -rk -rk -rk -Ov -MV -mY -rM -RP -Hv +RD qA qy fm @@ -65059,6 +65067,22 @@ aa aa aa aa +Hv +NW +rM +rM +ct +ps +ps +Zx +Ez +GT +Ov +ps +rk +rk +ig +Hv aa aa aa @@ -65089,23 +65113,7 @@ aa aa aa aa -aa -Hv -pM -rM -kI -Hv -up -SB -eS -NZ -SB -Hv -bJ -mY -rM -NW -Hv +RD hq xb cg @@ -65316,6 +65324,22 @@ aa aa aa aa +Hv +pM +rM +kC +Hv +RI +nq +RI +RI +RI +Hv +bJ +mY +rM +OS +Hv aa aa aa @@ -65346,25 +65370,9 @@ aa aa aa aa -aa -Hv -NW -rM -rM -ct -ps -lV -lW -lW -lV -Ov -ps -rk -rk -ps -Wi -HH -HH +RD +Yo +Yo Yo sT tU @@ -65573,6 +65581,22 @@ aa aa aa aa +Hv +NW +rk +kD +la +rk +rk +rk +rk +rk +Ov +MV +mY +rM +RP +Hv aa aa aa @@ -65603,23 +65627,7 @@ aa aa aa aa -aa -Hv -Wp -xX -zo -pc -Xc -KD -rc -na -dp -gC -ps -Ha -gA -zU -Hv +RD cg cg cg @@ -65830,6 +65838,22 @@ aa aa aa aa +pc +qc +rk +kE +Me +rk +rM +mn +mY +rk +Ov +MV +mY +rM +Np +Hv aa aa aa @@ -65860,23 +65884,7 @@ aa aa aa aa -aa -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv -Hv +RD cg cg cg @@ -66087,22 +66095,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +gR +rk +kF +lc +rk +rM +mo +mY +rk +Ov +MV +mY +rM +sJ +Hv aa aa aa @@ -66344,22 +66352,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +pc +oD +rk +kG +ld +rk +rM +rM +rM +rk +TD +ps +rM +rM +Pk +Hv aa aa aa @@ -66601,22 +66609,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +Pe +rk +kH +le +rk +rM +mo +mY +rk +Ov +MV +mY +rM +ML +pc aa aa aa @@ -66858,22 +66866,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +pc +BU +rk +kE +lb +rk +rM +mn +mY +rk +Ov +MV +mY +rM +Np +Hv aa aa aa @@ -67115,22 +67123,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +NW +rk +kD +lf +rk +rk +rk +rk +rk +Ov +MV +mY +rM +RP +Hv aa aa aa @@ -67372,22 +67380,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +pM +rM +kI +Hv +up +SB +eS +NZ +SB +Hv +bJ +mY +rM +NW +Hv aa aa aa @@ -67629,22 +67637,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +NW +rM +rM +ct +ps +lV +lW +lW +lV +Ov +ps +rk +rk +ps +Cr aa aa aa @@ -67886,22 +67894,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +Wp +xX +zo +pc +Xc +KD +rc +na +dp +gC +ps +Ha +gA +zU +Hv aa aa aa @@ -68143,22 +68151,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv +Hv aa aa aa From f851e7a46669686bdd69a54d4d07872b62133349 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 7 Oct 2023 11:50:33 -0600 Subject: [PATCH 11/21] fixed admin jail admin jail is now secured. courtroom is now secured. --- _maps/map_files/generic/CentCom.dmm | 495 ++++++++++++++-------------- 1 file changed, 243 insertions(+), 252 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index f4d0d870dd6c..cdddc5fed104 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -260,21 +260,10 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/armory) "bk" = ( -/obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/door/airlock/security/glass{ - name = "Central Command Brig"; - max_integrity = 1800; - normal_integrity = 1800 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/entrance, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/turf/open/floor/iron, +/turf/closed/indestructible/riveted, /area/centcom/central_command_areas/prison) "bm" = ( /obj/machinery/power/apc/auto_name/directional/south, @@ -282,6 +271,20 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"bn" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Central Command Brig"; + max_integrity = 1800; + normal_integrity = 1800 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/general, +/obj/effect/mapping_helpers/airlock/access/any/security/entrance, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/prison) "bu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -433,7 +436,7 @@ /area/centcom/central_command_areas/briefing) "bY" = ( /turf/open/floor/iron, -/area/space) +/area/centcom/central_command_areas/prison) "ca" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/fullgrass/style_random, @@ -1072,6 +1075,15 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) +"eJ" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/obj/structure/sign/painting/library_secure{ + pixel_y = -32 + }, +/turf/open/floor/iron/kitchen/diagonal, +/area/centcom/central_command_areas/fore) "eK" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -2658,6 +2670,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"ke" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Central Command Brig"; + max_integrity = 1800; + normal_integrity = 1800 + }, +/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/any/admin/general, +/obj/effect/mapping_helpers/airlock/access/any/security/entrance, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/prison) "kg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/structure/closet/crate/secure/freezer/pizza, @@ -3653,14 +3677,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) -"nM" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "XCC Security Checkpoint Shutters"; - id = "XCCsecdepartment" - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) "nR" = ( /obj/structure/closet/wardrobe/miner, /turf/open/floor/iron/white, @@ -5404,14 +5420,6 @@ "uh" = ( /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) -"uj" = ( -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/sparsegrass/style_random, -/obj/structure/flora/bush/fullgrass/style_random, -/obj/structure/flora/bush/flowers_br/style_random, -/obj/structure/flora/bush/generic/style_random, -/turf/open/floor/grass, -/area/centcom/central_command_areas/prison) "um" = ( /obj/machinery/computer/communications{ dir = 1 @@ -8481,29 +8489,19 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) -"GC" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/security/glass{ - name = "Central Command Brig"; - max_integrity = 1800; - normal_integrity = 1800 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/entrance, -/obj/effect/mapping_helpers/airlock/access/any/admin/general, -/obj/effect/mapping_helpers/airlock/access/any/service/lawyer, -/turf/open/floor/iron, -/area/centcom/central_command_areas/prison) "GE" = ( /turf/open/floor/iron/tgmcemblem/center{ dir = 8 }, /area/centcom/central_command_areas/prison) +"GF" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + name = "XCC Security Checkpoint Shutters"; + id = "XCCsecdepartment" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/prison) "GH" = ( /obj/machinery/light/directional/east, /obj/item/statuebust, @@ -10044,6 +10042,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"NM" = ( +/turf/open/floor/glass/reinforced, +/area/centcom/central_command_areas/prison) "NN" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -10700,7 +10701,7 @@ /area/centcom/central_command_areas/admin) "Qc" = ( /turf/closed/indestructible/fakeglass, -/area/space) +/area/centcom/central_command_areas/prison) "Qd" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/drinkingglass{ @@ -11056,9 +11057,6 @@ dir = 8 }, /obj/machinery/light/directional/east, -/obj/structure/sign/painting/library_secure{ - pixel_x = 32 - }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) "Rp" = ( @@ -11140,9 +11138,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/centcom/tdome/observation) -"RD" = ( -/turf/closed/indestructible/riveted, -/area/space) "RF" = ( /obj/structure/table/reinforced, /obj/item/crowbar/red, @@ -11788,10 +11783,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin/storage) -"Uc" = ( -/obj/effect/spawner/structure/window/reinforced/indestructible, -/turf/open/floor/plating, -/area/centcom/central_command_areas/prison) "Ud" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -57135,7 +57126,7 @@ Mn rC uR Qh -rC +eJ Vx Vx Vx @@ -57637,33 +57628,33 @@ aa aa aa aa -RD -RD -RD -RD -RD -RD -RD +il +il +il +il +il +il +il Qc Qc Qc Qc Qc Qc -RD -RD -RD -RD -RD -RD -RD -RD -RD -RD -io -io -io -io +il +il +il +il +il +il +il +il +il +il +il +il +il +il io UN tL @@ -57897,27 +57888,27 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -io +il +bY +bY +bY +NM +NM +NM +NM +NM +NM +bY +bY +bY +bY +bY +bY +bY +bY +bY +bY +bY bY bY bY @@ -58154,30 +58145,30 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -io -RD -RD -RD +il +bY +il +il +Qc +Qc +Qc +Qc +Qc +Qc +il +il +il +il +il +il +il +il +il +il +il +il +il +il io tO tN @@ -58411,9 +58402,9 @@ aa aa aa aa -aa -aa -aa +il +bY +il aa aa aa @@ -58668,9 +58659,9 @@ aa aa aa aa -aa -aa -aa +il +bY +il aa aa aa @@ -58925,9 +58916,9 @@ aa aa aa aa -aa -aa -aa +il +bY +il aa aa aa @@ -59182,9 +59173,9 @@ aa aa aa aa -aa -aa -aa +il +bY +il aa aa aa @@ -59439,9 +59430,9 @@ aa aa aa aa -aa -aa -aa +il +bY +il aa aa aa @@ -59696,9 +59687,9 @@ aa aa aa aa -aa -aa -aa +il +bY +il aa aa aa @@ -59935,17 +59926,14 @@ Jb Jb Jb Jb -Mz il -Uc +il +il bk -Uc +il bk -Uc -aa -aa -aa -aa +il +il aa aa aa @@ -59956,6 +59944,9 @@ aa aa aa aa +il +bY +il aa aa aa @@ -60192,17 +60183,14 @@ Dj rs ze Jb -uj +bY +bY +bY +bY +bY +bY +bY il -nM -nM -nM -nM -nM -aa -aa -aa -aa aa aa aa @@ -60213,6 +60201,9 @@ aa aa aa aa +il +bY +il aa aa aa @@ -60451,15 +60442,12 @@ iB Jb iH il -Uc -GC -Uc -GC -Uc -aa -aa -aa -aa +bY +bY +bY +bY +bY +il aa aa aa @@ -60470,6 +60458,9 @@ aa aa aa aa +il +bY +il aa aa aa @@ -60713,6 +60704,7 @@ iT iT iT ls +il aa aa aa @@ -60723,10 +60715,9 @@ aa aa aa aa -aa -aa -aa -aa +il +bY +il aa aa aa @@ -60970,6 +60961,7 @@ iU iU jx jG +il aa aa aa @@ -60980,6 +60972,9 @@ aa aa aa aa +il +bY +il aa aa aa @@ -60997,11 +60992,7 @@ aa aa aa aa -aa -aa -aa -aa -RD +cg cg cg cg @@ -61227,6 +61218,9 @@ nz nz jw pm +il +il +il aa aa aa @@ -61235,6 +61229,9 @@ aa aa aa aa +il +bY +il aa aa aa @@ -61252,13 +61249,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -RD +cg cg PL fm @@ -61484,6 +61475,20 @@ nY nz jw jG +il +il +il +il +il +il +il +il +il +il +il +il +bY +il aa aa aa @@ -61501,21 +61506,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -RD +cg cg cg cg @@ -61741,6 +61732,20 @@ nZ il jE jG +ke +GF +bn +bY +bY +bY +bY +bY +bY +bY +bY +bY +bY +il aa aa aa @@ -61758,21 +61763,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -RD +cg Cd qz cg @@ -61998,6 +61989,20 @@ oa nz jw jG +il +il +il +il +il +il +il +il +il +il +il +il +il +il aa aa aa @@ -62015,21 +62020,7 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -RD +cg qz qy cg @@ -62255,6 +62246,9 @@ nz nz jw pm +il +il +il aa aa aa @@ -62283,10 +62277,7 @@ aa aa aa aa -aa -aa -aa -RD +cg qA Cd fm @@ -62512,6 +62503,7 @@ iT iT jH jG +il aa aa aa @@ -62542,8 +62534,7 @@ aa aa aa aa -aa -RD +cg qy qz cg @@ -62769,6 +62760,7 @@ iU iU iU lt +il aa aa aa @@ -62799,8 +62791,7 @@ aa aa aa aa -aa -RD +cg qy qz cg @@ -63026,6 +63017,7 @@ ja yR ja yR +Hv aa aa aa @@ -63056,8 +63048,7 @@ aa aa aa aa -aa -RD +cg cg fm cg @@ -63314,7 +63305,7 @@ aa aa aa aa -RD +cg qB qW rT @@ -63571,7 +63562,7 @@ aa aa aa aa -RD +cg qC qX rU @@ -63828,7 +63819,7 @@ aa aa aa aa -RD +cg qD qY rV @@ -64085,7 +64076,7 @@ aa aa aa aa -RD +cg cg fm cg @@ -64342,7 +64333,7 @@ aa aa aa aa -RD +cg qz qy cg @@ -64599,7 +64590,7 @@ aa aa aa aa -RD +cg qy YI cg @@ -64856,7 +64847,7 @@ aa aa aa aa -RD +cg qA qy fm @@ -65113,7 +65104,7 @@ aa aa aa aa -RD +cg hq xb cg @@ -65370,7 +65361,7 @@ aa aa aa aa -RD +cg Yo Yo Yo @@ -65627,7 +65618,7 @@ aa aa aa aa -RD +cg cg cg cg @@ -65884,7 +65875,7 @@ aa aa aa aa -RD +cg cg cg cg From cf7b95a45d07148e127fd4e0fa2e87b9c6e7bbac Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 7 Oct 2023 14:52:08 -0600 Subject: [PATCH 12/21] fixed admin jail again admin jail is now 99% fixed. it is very secure now. From 456f37f7677eda4cb923c52947007764f9dfe2a0 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 7 Oct 2023 15:34:12 -0600 Subject: [PATCH 13/21] moved multicam and podship sits in better spot now. allows for room to move/expand facilities at cc. --- _maps/map_files/generic/CentCom.dmm | 3426 +++++++++++++-------------- 1 file changed, 1713 insertions(+), 1713 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index cdddc5fed104..f6387389deb4 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -14008,29 +14008,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di aa aa aa @@ -14265,29 +14265,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -14522,29 +14522,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -14779,29 +14779,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -15036,29 +15036,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -15293,29 +15293,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -15550,29 +15550,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -15807,29 +15807,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -16064,29 +16064,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -16321,29 +16321,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -16578,29 +16578,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -16835,29 +16835,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +pW +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -17092,29 +17092,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -17349,29 +17349,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -17606,6 +17606,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -17619,6 +17642,7 @@ aa aa aa aa +fR aa aa aa @@ -17627,6 +17651,8 @@ aa aa aa aa +"} +(18,1,1) = {" aa aa aa @@ -17642,17 +17668,9 @@ aa aa aa aa -fR -aa -aa -aa -aa -aa aa aa aa -"} -(18,1,1) = {" aa aa aa @@ -17690,6 +17708,7 @@ aa aa aa aa +Fi aa aa aa @@ -17708,7 +17727,6 @@ aa aa aa aa -Fi aa aa aa @@ -17845,6 +17863,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -17867,6 +17908,8 @@ aa aa aa aa +"} +(19,1,1) = {" aa aa aa @@ -17908,8 +17951,6 @@ aa aa aa aa -"} -(19,1,1) = {" aa aa aa @@ -18079,117 +18120,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa aa +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -aa -"} -(20,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +"} +(20,1,1) = {" aa aa aa @@ -18400,6 +18377,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -18634,29 +18634,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -18891,29 +18891,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -19148,29 +19148,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -19405,29 +19405,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +pu +Di aa aa aa @@ -19662,29 +19662,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di aa aa aa @@ -25060,13 +25060,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +KH +Lt +Lt +Lt +Lt +Lt +Lt aa aa aa @@ -25316,14 +25316,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +KH +Lt +KK +wk +Qt +Lk +cP +MM aa aa aa @@ -25573,14 +25573,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +Lt +tA +wX +HG +HG +Lk +cP +KQ aa aa aa @@ -25830,14 +25830,14 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa +KH +Lt +Lt +LJ +fW +SC +Lt +Lt aa aa aa @@ -26089,11 +26089,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +Lt +Lt +qp +Lt +Lt aa aa aa @@ -26346,19 +26346,19 @@ aa aa aa aa +fT +Lo +Lf +Sd +pV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +KH +Lt +Lt +Lt +KH aa aa aa @@ -26603,20 +26603,20 @@ aa aa aa aa +Lt +Lt +qp +Lt +Lt aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +KH +Lt +cl +HR +Gi +Lt +KH aa aa aa @@ -26859,8 +26859,26 @@ aa aa aa aa +KH +Lt +aZ +Xj +cr +Lt aa aa +Lt +Vh +LI +CH +CH +PJ +Lt +Lt +Lt +Lt +Lt +KH aa aa aa @@ -26885,6 +26903,8 @@ aa aa aa aa +"} +(54,1,1) = {" aa aa aa @@ -26903,14 +26923,6 @@ aa aa aa aa -"} -(54,1,1) = {" -aa -aa -aa -aa -aa -aa aa aa aa @@ -27104,17 +27116,41 @@ aa aa aa aa +Lt +Xp +lg +KZ +aL +Lt +Lt aa +LH +LN +OW +yX +yX +Nm +Lt +ey +LG +pH +gj +Lt +KH aa +ut aa aa aa +LM aa aa aa +Pw aa aa aa +pJ aa aa aa @@ -27124,6 +27160,8 @@ aa aa aa aa +"} +(55,1,1) = {" aa aa aa @@ -27160,11 +27198,6 @@ aa aa aa aa -"} -(55,1,1) = {" -aa -aa -aa aa aa aa @@ -27340,6 +27373,43 @@ aa aa aa aa +Lw +QB +ec +Ae +HZ +QD +Lt +Lt +Lt +LO +Zq +Yx +AA +Da +Lt +iI +LF +BR +MC +EN +Lt +Lt +LC +Lt +Lt +Lt +LC +Lt +Lt +Lt +LC +Lt +Lt +Lt +LC +Lt +KH aa aa aa @@ -27347,6 +27417,8 @@ aa aa aa aa +"} +(56,1,1) = {" aa aa aa @@ -27417,8 +27489,6 @@ aa aa aa aa -"} -(56,1,1) = {" aa aa aa @@ -27560,6 +27630,43 @@ aa aa aa aa +Lw +Yi +fV +YW +vJ +aI +Lt +pZ +Lt +mB +Lj +fI +vq +OF +Lw +wP +ud +Iv +NI +NI +Lw +KP +JE +Vv +of +LD +KV +EL +Ew +Lu +KV +LD +TM +LD +JE +Tu +Lt aa aa aa @@ -27567,6 +27674,8 @@ aa aa aa aa +"} +(57,1,1) = {" aa aa aa @@ -27674,8 +27783,6 @@ aa aa aa aa -"} -(57,1,1) = {" aa aa aa @@ -27780,6 +27887,43 @@ aa aa aa aa +Lw +SX +jC +Hl +Hl +YW +gd +kr +dK +LQ +LQ +cj +cj +wT +Lm +HL +HJ +HJ +HJ +HJ +ci +QH +WE +WE +Li +Lb +Lb +WE +WE +Lb +Li +Li +Lb +bN +bN +bN +Lt aa aa aa @@ -27787,6 +27931,8 @@ aa aa aa aa +"} +(58,1,1) = {" aa aa aa @@ -27931,8 +28077,6 @@ aa aa aa aa -"} -(58,1,1) = {" aa aa aa @@ -28000,6 +28144,43 @@ aa aa aa aa +Lw +Rp +bb +MH +fV +sm +Lt +OG +Lt +LR +Tm +Tm +Ff +yH +Lw +AD +oY +dn +dn +eR +Lw +KO +LA +nb +sB +zx +ZA +Lp +sB +DA +LA +Lp +FE +Lp +LB +tm +Lt aa aa aa @@ -28007,6 +28188,8 @@ aa aa aa aa +"} +(59,1,1) = {" aa aa aa @@ -28188,8 +28371,6 @@ aa aa aa aa -"} -(59,1,1) = {" aa aa aa @@ -28220,6 +28401,43 @@ aa aa aa aa +Lw +CT +sw +dv +Lz +QD +Lt +Lt +Lt +KJ +Eq +Ip +Ip +JT +Lt +Dn +BR +LG +BR +RT +Lt +Lt +LP +Lt +Lt +Lt +LP +Lt +Lt +Lt +LP +Lt +Lt +Lt +LP +Lt +KH aa aa aa @@ -28227,6 +28445,8 @@ aa aa aa aa +"} +(60,1,1) = {" aa aa aa @@ -28438,19 +28658,41 @@ aa aa aa aa +Lt +sF +Ln +YH +Tb +Lt +Lt aa +Lt +ZG +AG +Qd +Tv +EH +Lt +Ll +LG +mU +RJ +Lt +KH aa +gi aa aa aa +cJ aa aa -"} -(60,1,1) = {" aa +KS aa aa aa +zr aa aa aa @@ -28460,6 +28702,8 @@ aa aa aa aa +"} +(61,1,1) = {" aa aa aa @@ -28671,8 +28915,26 @@ aa aa aa aa +KH +Lt +LU +Ld +rG +Lt aa aa +Lt +EV +eX +mf +rz +wN +Lt +Lt +Lt +Lt +Lt +KH aa aa aa @@ -28697,13 +28959,13 @@ aa aa aa aa +"} +(62,1,1) = {" aa aa aa aa aa -"} -(61,1,1) = {" aa aa aa @@ -28911,8 +29173,20 @@ aa aa aa aa +Lt +Lt +ge +Lt +Lt aa aa +KH +Lt +Cy +iC +Po +Lt +KH aa aa aa @@ -28942,6 +29216,8 @@ aa aa aa aa +"} +(63,1,1) = {" aa aa aa @@ -28959,8 +29235,6 @@ aa aa aa aa -"} -(62,1,1) = {" aa aa aa @@ -29156,9 +29430,19 @@ aa aa aa aa +fT +Lo +Rk +Sd +pV aa aa aa +KH +Lt +Lt +Lt +KH aa aa aa @@ -29189,6 +29473,8 @@ aa aa aa aa +"} +(64,1,1) = {" aa aa aa @@ -29216,8 +29502,6 @@ aa aa aa aa -"} -(63,1,1) = {" aa aa aa @@ -29403,6 +29687,11 @@ aa aa aa aa +Lt +Lt +ge +Lt +Lt aa aa aa @@ -29441,6 +29730,8 @@ aa aa aa aa +"} +(65,1,1) = {" aa aa aa @@ -29473,8 +29764,6 @@ aa aa aa aa -"} -(64,1,1) = {" aa aa aa @@ -29653,6 +29942,14 @@ aa aa aa aa +KH +Lt +Lt +Te +DL +CF +Lt +Lt aa aa aa @@ -29682,29 +29979,6 @@ aa aa aa aa -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di aa aa aa @@ -29713,6 +29987,8 @@ aa aa aa aa +"} +(66,1,1) = {" aa aa aa @@ -29730,8 +30006,6 @@ aa aa aa aa -"} -(65,1,1) = {" aa aa aa @@ -29925,6 +30199,14 @@ aa aa aa aa +Lt +fz +za +MX +DL +ep +cP +MM aa aa aa @@ -29939,29 +30221,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -29985,10 +30244,10 @@ aa aa aa aa +"} +(67,1,1) = {" aa aa -"} -(66,1,1) = {" aa aa aa @@ -30196,30 +30455,15 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa +KH +Lt +cT +Hb +OC +ep +cP +KQ aa aa aa @@ -30244,8 +30488,6 @@ aa aa aa aa -"} -(67,1,1) = {" aa aa aa @@ -30259,6 +30501,8 @@ aa aa aa aa +"} +(68,1,1) = {" aa aa aa @@ -30453,29 +30697,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -30493,6 +30714,13 @@ aa aa aa aa +KH +Lt +Lt +Lt +Lt +Lt +Lt aa aa aa @@ -30501,8 +30729,6 @@ aa aa aa aa -"} -(68,1,1) = {" aa aa aa @@ -30532,6 +30758,8 @@ aa aa aa aa +"} +(69,1,1) = {" aa aa aa @@ -30710,29 +30938,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -30758,8 +30963,6 @@ aa aa aa aa -"} -(69,1,1) = {" aa aa aa @@ -30812,6 +31015,8 @@ aa aa aa aa +"} +(70,1,1) = {" aa aa aa @@ -30967,29 +31172,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -31015,8 +31197,6 @@ aa aa aa aa -"} -(70,1,1) = {" aa aa aa @@ -31092,6 +31272,8 @@ aa aa aa aa +"} +(71,1,1) = {" aa aa aa @@ -31224,29 +31406,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -31272,8 +31431,6 @@ aa aa aa aa -"} -(71,1,1) = {" aa aa aa @@ -31372,6 +31529,8 @@ aa aa aa aa +"} +(72,1,1) = {" aa aa aa @@ -31481,29 +31640,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -31529,8 +31665,6 @@ aa aa aa aa -"} -(72,1,1) = {" aa aa aa @@ -31652,6 +31786,8 @@ aa aa aa aa +"} +(73,1,1) = {" aa aa aa @@ -31738,29 +31874,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -31786,8 +31899,6 @@ aa aa aa aa -"} -(73,1,1) = {" aa aa aa @@ -31932,6 +32043,8 @@ aa aa aa aa +"} +(74,1,1) = {" aa aa aa @@ -31995,29 +32108,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -32043,8 +32133,6 @@ aa aa aa aa -"} -(74,1,1) = {" aa aa aa @@ -32212,6 +32300,8 @@ aa aa aa aa +"} +(75,1,1) = {" aa aa aa @@ -32252,29 +32342,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -32300,8 +32367,6 @@ aa aa aa aa -"} -(75,1,1) = {" aa aa aa @@ -32492,6 +32557,9 @@ aa aa aa aa +"} +(76,1,1) = {" +aa aa aa aa @@ -32509,29 +32577,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -pW -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -32557,8 +32602,6 @@ aa aa aa aa -"} -(76,1,1) = {" aa aa aa @@ -32766,34 +32809,16 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa aa aa +"} +(77,1,1) = {" +aa +aa +aa aa aa aa @@ -32814,8 +32839,6 @@ aa aa aa aa -"} -(77,1,1) = {" aa aa aa @@ -33023,29 +33046,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -33280,29 +33280,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -33328,8 +33305,6 @@ aa aa aa aa -"} -(79,1,1) = {" aa aa aa @@ -33353,6 +33328,8 @@ aa aa aa aa +"} +(79,1,1) = {" aa aa aa @@ -33537,29 +33514,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -33585,8 +33539,6 @@ aa aa aa aa -"} -(80,1,1) = {" aa aa aa @@ -33633,6 +33585,8 @@ aa aa aa aa +"} +(80,1,1) = {" aa aa aa @@ -33794,29 +33748,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -33842,8 +33773,6 @@ aa aa aa aa -"} -(81,1,1) = {" aa aa aa @@ -33913,6 +33842,8 @@ aa aa aa aa +"} +(81,1,1) = {" aa aa aa @@ -34051,29 +33982,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -34099,8 +34007,6 @@ aa aa aa aa -"} -(82,1,1) = {" aa aa aa @@ -34193,6 +34099,8 @@ aa aa aa aa +"} +(82,1,1) = {" aa aa aa @@ -34308,29 +34216,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -34356,8 +34241,6 @@ aa aa aa aa -"} -(83,1,1) = {" aa aa aa @@ -34473,6 +34356,8 @@ aa aa aa aa +"} +(83,1,1) = {" aa aa aa @@ -34565,29 +34450,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -34613,8 +34475,6 @@ aa aa aa aa -"} -(84,1,1) = {" aa aa aa @@ -34753,6 +34613,8 @@ aa aa aa aa +"} +(84,1,1) = {" aa aa aa @@ -34822,29 +34684,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di aa aa aa @@ -34870,8 +34709,6 @@ aa aa aa aa -"} -(85,1,1) = {" aa aa aa @@ -35033,6 +34870,8 @@ aa aa aa aa +"} +(85,1,1) = {" aa aa aa @@ -35079,29 +34918,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -pu -Di aa aa aa @@ -35127,8 +34943,6 @@ aa aa aa aa -"} -(86,1,1) = {" aa aa aa @@ -35313,6 +35127,8 @@ aa aa aa aa +"} +(86,1,1) = {" aa aa aa @@ -35336,29 +35152,6 @@ aa aa aa aa -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di aa aa aa @@ -35384,8 +35177,6 @@ aa aa aa aa -"} -(87,1,1) = {" aa aa aa @@ -35593,6 +35384,8 @@ aa aa aa aa +"} +(87,1,1) = {" aa aa aa @@ -35641,8 +35434,6 @@ aa aa aa aa -"} -(88,1,1) = {" aa aa aa @@ -35850,6 +35641,8 @@ aa aa aa aa +"} +(88,1,1) = {" aa aa aa @@ -35898,8 +35691,6 @@ aa aa aa aa -"} -(89,1,1) = {" aa aa aa @@ -36107,6 +35898,8 @@ aa aa aa aa +"} +(89,1,1) = {" aa aa aa @@ -36155,8 +35948,6 @@ aa aa aa aa -"} -(90,1,1) = {" aa aa aa @@ -36364,6 +36155,8 @@ aa aa aa aa +"} +(90,1,1) = {" aa aa aa @@ -36412,8 +36205,6 @@ aa aa aa aa -"} -(91,1,1) = {" aa aa aa @@ -36621,6 +36412,8 @@ aa aa aa aa +"} +(91,1,1) = {" aa aa aa @@ -36669,8 +36462,6 @@ aa aa aa aa -"} -(92,1,1) = {" aa aa aa @@ -36878,6 +36669,8 @@ aa aa aa aa +"} +(92,1,1) = {" aa aa aa @@ -36926,8 +36719,6 @@ aa aa aa aa -"} -(93,1,1) = {" aa aa aa @@ -37135,6 +36926,8 @@ aa aa aa aa +"} +(93,1,1) = {" aa aa aa @@ -37183,8 +36976,6 @@ aa aa aa aa -"} -(94,1,1) = {" aa aa aa @@ -37392,6 +37183,8 @@ aa aa aa aa +"} +(94,1,1) = {" aa aa aa @@ -37440,8 +37233,6 @@ aa aa aa aa -"} -(95,1,1) = {" aa aa aa @@ -37649,6 +37440,8 @@ aa aa aa aa +"} +(95,1,1) = {" aa aa aa @@ -37697,8 +37490,6 @@ aa aa aa aa -"} -(96,1,1) = {" aa aa aa @@ -37906,6 +37697,8 @@ aa aa aa aa +"} +(96,1,1) = {" aa aa aa @@ -37954,8 +37747,6 @@ aa aa aa aa -"} -(97,1,1) = {" aa aa aa @@ -38163,6 +37954,8 @@ aa aa aa aa +"} +(97,1,1) = {" aa aa aa @@ -38211,8 +38004,6 @@ aa aa aa aa -"} -(98,1,1) = {" aa aa aa @@ -38420,16 +38211,11 @@ aa aa aa aa +"} +(98,1,1) = {" aa aa aa -KH -Lt -Lt -Lt -Lt -Lt -Lt aa aa aa @@ -38468,8 +38254,6 @@ aa aa aa aa -"} -(99,1,1) = {" aa aa aa @@ -38679,19 +38463,13 @@ aa aa aa aa -KH -Lt -KK -wk -Qt -Lk -cP -MM aa aa aa aa aa +"} +(99,1,1) = {" aa aa aa @@ -38725,8 +38503,6 @@ aa aa aa aa -"} -(100,1,1) = {" aa aa aa @@ -38936,14 +38712,6 @@ aa aa aa aa -Lt -tA -wX -HG -HG -Lk -cP -KQ aa aa aa @@ -38957,6 +38725,8 @@ aa aa aa aa +"} +(100,1,1) = {" aa aa aa @@ -38982,8 +38752,6 @@ aa aa aa aa -"} -(101,1,1) = {" aa aa aa @@ -39193,14 +38961,6 @@ aa aa aa aa -KH -Lt -Lt -LJ -fW -SC -Lt -Lt aa aa aa @@ -39222,6 +38982,15 @@ aa aa aa aa +"} +(101,1,1) = {" +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -39239,8 +39008,6 @@ aa aa aa aa -"} -(102,1,1) = {" aa aa aa @@ -39367,25 +39134,6 @@ aa aa aa aa -On -On -Zf -Zf -Zf -On -On -On -Zf -Zf -Zf -On -On -On -Zf -Zf -Zf -On -On aa aa aa @@ -39452,11 +39200,6 @@ aa aa aa aa -Lt -Lt -qp -Lt -Lt aa aa aa @@ -39497,7 +39240,7 @@ aa aa aa "} -(103,1,1) = {" +(102,1,1) = {" aa aa aa @@ -39625,23 +39368,23 @@ aa aa aa On -Tx -pi -pi -pi -Ly On -Tx -pi -pi -pi -Ly +Zf +Zf +Zf +On +On +On +Zf +Zf +Zf +On +On +On +Zf +Zf +Zf On -Tx -pi -pi -pi -Ly On aa aa @@ -39709,19 +39452,19 @@ aa aa aa aa -fT -Lo -Lf -Sd -pV aa aa aa -KH -Lt -Lt -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -39754,7 +39497,7 @@ aa aa aa "} -(104,1,1) = {" +(103,1,1) = {" aa aa aa @@ -39882,23 +39625,23 @@ aa aa aa On -gf -hw +Tx pi pi -oT +pi +Ly On -gf -hw +Tx pi pi -oT +pi +Ly On -gf -hw +Tx pi pi -oT +pi +Ly On aa aa @@ -39966,20 +39709,20 @@ aa aa aa aa -Lt -Lt -qp -Lt -Lt aa aa -KH -Lt -cl -HR -Gi -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -40011,7 +39754,7 @@ aa aa aa "} -(105,1,1) = {" +(104,1,1) = {" aa aa aa @@ -40139,23 +39882,23 @@ aa aa aa On -lQ -eU -NK +gf +hw pi pi +oT On -lQ -eU -NK +gf +hw pi pi +oT On -lQ -eU -NK +gf +hw pi pi +oT On aa aa @@ -40222,26 +39965,26 @@ aa aa aa aa -KH -Lt -aZ -Xj -cr -Lt aa aa -Lt -Vh -LI -CH -CH -PJ -Lt -Lt -Lt -Lt -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -40268,7 +40011,7 @@ aa aa aa "} -(106,1,1) = {" +(105,1,1) = {" aa aa aa @@ -40396,21 +40139,21 @@ aa aa aa On -pi -pp -hw +lQ +eU +NK pi pi On -pi -pp -hw +lQ +eU +NK pi pi On -pi -pp -hw +lQ +eU +NK pi pi On @@ -40479,41 +40222,17 @@ aa aa aa aa -Lt -Xp -lg -KZ -aL -Lt -Lt aa -LH -LN -OW -yX -yX -Nm -Lt -ey -LG -pH -gj -Lt -KH aa -ut aa aa aa -LM aa aa aa -Pw aa aa aa -pJ aa aa aa @@ -40524,8 +40243,6 @@ aa aa aa aa -"} -(107,1,1) = {" aa aa aa @@ -40550,6 +40267,8 @@ aa aa aa aa +"} +(106,1,1) = {" aa aa aa @@ -40652,23 +40371,47 @@ aa aa aa aa -On -pi -pi -pi -pi -pi -On -pi -pi -pi -pi -pi -On -pi -pi +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +On +pi +pp +hw +pi +pi +On +pi +pp +hw pi pi +On +pi +pp +hw +pi pi On aa @@ -40736,43 +40479,300 @@ aa aa aa aa -Lw -QB -ec -Ae -HZ -QD -Lt -Lt -Lt -LO -Zq -Yx -AA -Da -Lt -iI -LF -BR -MC -EN -Lt -Lt -LC -Lt -Lt -Lt -LC -Lt -Lt -Lt -LC -Lt -Lt -Lt -LC -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(107,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +On +pi +pi +pi +pi +pi +On +pi +pi +pi +pi +pi +On +pi +pi +pi +pi +pi +On +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -40993,43 +40993,43 @@ aa aa aa aa -Lw -Yi -fV -YW -vJ -aI -Lt -pZ -Lt -mB -Lj -fI -vq -OF -Lw -wP -ud -Iv -NI -NI -Lw -KP -JE -Vv -of -LD -KV -EL -Ew -Lu -KV -LD -TM -LD -JE -Tu -Lt +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -41250,43 +41250,43 @@ aa aa aa aa -Lw -SX -jC -Hl -Hl -YW -gd -kr -dK -LQ -LQ -cj -cj -wT -Lm -HL -HJ -HJ -HJ -HJ -ci -QH -WE -WE -Li -Lb -Lb -WE -WE -Lb -Li -Li -Lb -bN -bN -bN -Lt +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -41507,43 +41507,43 @@ aa aa aa aa -Lw -Rp -bb -MH -fV -sm -Lt -OG -Lt -LR -Tm -Tm -Ff -yH -Lw -AD -oY -dn -dn -eR -Lw -KO -LA -nb -sB -zx -ZA -Lp -sB -DA -LA -Lp -FE -Lp -LB -tm -Lt +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -41764,43 +41764,43 @@ aa aa aa aa -Lw -CT -sw -dv -Lz -QD -Lt -Lt -Lt -KJ -Eq -Ip -Ip -JT -Lt -Dn -BR -LG -BR -RT -Lt -Lt -LP -Lt -Lt -Lt -LP -Lt -Lt -Lt -LP -Lt -Lt -Lt -LP -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -42021,41 +42021,41 @@ aa aa aa aa -Lt -sF -Ln -YH -Tb -Lt -Lt aa -Lt -ZG -AG -Qd -Tv -EH -Lt -Ll -LG -mU -RJ -Lt -KH aa -gi aa aa aa -cJ aa aa aa -KS aa aa aa -zr +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -42278,26 +42278,26 @@ aa aa aa aa -KH -Lt -LU -Ld -rG -Lt aa aa -Lt -EV -eX -mf -rz -wN -Lt -Lt -Lt -Lt -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -42536,20 +42536,20 @@ aa aa aa aa -Lt -Lt -ge -Lt -Lt aa aa -KH -Lt -Cy -iC -Po -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -42793,19 +42793,19 @@ aa aa aa aa -fT -Lo -Rk -Sd -pV aa aa aa -KH -Lt -Lt -Lt -KH +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -43050,11 +43050,11 @@ aa aa aa aa -Lt -Lt -ge -Lt -Lt +aa +aa +aa +aa +aa aa aa aa @@ -43305,14 +43305,14 @@ aa aa aa aa -KH -Lt -Lt -Te -DL -CF -Lt -Lt +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -43562,14 +43562,14 @@ aa aa aa aa -Lt -fz -za -MX -DL -ep -cP -MM +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -43819,14 +43819,14 @@ aa aa aa aa -KH -Lt -cT -Hb -OC -ep -cP -KQ +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -44077,13 +44077,13 @@ aa aa aa aa -KH -Lt -Lt -Lt -Lt -Lt -Lt +aa +aa +aa +aa +aa +aa +aa aa aa aa From d54fb90287f12ea5ae2c501c948ca3eb258ef0e7 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 8 Oct 2023 12:44:40 -0600 Subject: [PATCH 14/21] removal of magic mirror permanent removal of magic mirror due to abuse. --- _maps/map_files/generic/CentCom.dmm | 399 ++++++++++++++++++++-------- 1 file changed, 284 insertions(+), 115 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index f6387389deb4..5dafe6527890 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5,6 +5,32 @@ "ad" = ( /turf/open/space, /area/space) +"ah" = ( +/obj/structure/closet/crate{ + name = "Plasmaman Essentials" + }, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/head/helmet/space/plasmaman, +/obj/item/clothing/gloves/color/plasmaman, +/obj/item/clothing/gloves/color/plasmaman, +/obj/item/clothing/gloves/color/plasmaman, +/obj/item/clothing/gloves/color/plasmaman, +/obj/item/clothing/gloves/color/plasmaman, +/obj/item/clothing/suit/space/eva/plasmaman, +/obj/item/clothing/suit/space/eva/plasmaman, +/obj/item/clothing/suit/space/eva/plasmaman, +/obj/item/clothing/suit/space/eva/plasmaman, +/obj/item/clothing/suit/space/eva/plasmaman, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/item/tank/internals/plasmaman/belt/full, +/turf/open/floor/wood, +/area/centcom/central_command_areas/ghost_spawn) "ai" = ( /obj/item/flashlight/lamp, /obj/structure/table/reinforced, @@ -458,6 +484,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"cd" = ( +/obj/machinery/rnd/production/protolathe/department/science, +/turf/open/floor/circuit/green, +/area/centcom/central_command_areas/admin) "cf" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/supply) @@ -764,6 +794,12 @@ }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) +"ds" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/turf/open/floor/stone, +/area/centcom/central_command_areas/admin) "dt" = ( /obj/structure/window/reinforced/tinted/frosted, /obj/structure/closet/mini_fridge, @@ -1296,6 +1332,9 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/administration) +"fC" = ( +/turf/open/floor/stone, +/area/centcom/central_command_areas/admin) "fE" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -1799,6 +1838,11 @@ "hD" = ( /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"hF" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/medical/laptop, +/turf/open/floor/stone, +/area/centcom/central_command_areas/admin) "hG" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -1843,6 +1887,7 @@ "hR" = ( /obj/structure/table/reinforced/titaniumglass, /obj/item/pizzabox/infinite, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) "hS" = ( @@ -1871,6 +1916,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"hZ" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) "ia" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -1883,6 +1932,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"id" = ( +/obj/structure/table/wood, +/obj/item/book/granter/sign_language, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "ie" = ( /obj/item/soap/nanotrasen, /turf/open/floor/iron/white, @@ -3002,6 +3056,12 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"ll" = ( +/obj/machinery/door/airlock/wood{ + name = "Gabbie's Office" + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "lm" = ( /obj/structure/window/plasma/spawner/directional/north, /obj/structure/window/plasma/spawner/directional/west, @@ -3301,6 +3361,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/centcom/tdome/administration) +"mv" = ( +/obj/machinery/door/poddoor/shutters/indestructible/preopen{ + dir = 4 + }, +/turf/closed/indestructible/fakeglass, +/area/centcom/central_command_areas/admin) "mw" = ( /obj/structure/cable, /obj/structure/chair/comfy/black{ @@ -4058,6 +4124,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"pe" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/donut_box, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "pf" = ( /obj/structure/table/reinforced, /obj/item/crowbar/red, @@ -4146,7 +4218,9 @@ /area/centcom/ai_multicam_room) "pv" = ( /obj/effect/rune/narsie, -/obj/structure/chair/comfy/carp, +/obj/structure/chair/comfy/carp{ + dir = 1 + }, /turf/open/floor/plating/abductor, /area/centcom/central_command_areas/admin) "pw" = ( @@ -4154,12 +4228,6 @@ /obj/machinery/vending/imported/yangyu, /turf/open/floor/iron, /area/centcom/central_command_areas/control) -"pz" = ( -/obj/structure/table/reinforced/plastitaniumglass{ - name = "Andrea's Desk" - }, -/turf/open/floor/carpet/royalblue, -/area/centcom/central_command_areas/admin) "pA" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -4375,6 +4443,7 @@ "qm" = ( /obj/structure/table/reinforced/titaniumglass, /obj/machinery/computer/records/security/laptop, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) "qn" = ( @@ -4697,6 +4766,10 @@ }, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) +"rD" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/admin) "rF" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/structure/flora/bush/grassy/style_random, @@ -5902,7 +5975,9 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) "wb" = ( -/obj/structure/closet/crate/bin, +/obj/structure/chair/sofa/right{ + dir = 4 + }, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) "wg" = ( @@ -5950,6 +6025,13 @@ }, /turf/open/floor/elevated, /area/centcom/central_command_areas/fore) +"wo" = ( +/obj/structure/table/reinforced/plastitaniumglass{ + name = "Andrea's Desk" + }, +/obj/machinery/coffeemaker/impressa, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "wp" = ( /obj/structure/chair/sofa/left/brown{ dir = 4 @@ -6164,6 +6246,10 @@ }, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"wY" = ( +/obj/machinery/autolathe, +/turf/open/floor/circuit/green, +/area/centcom/central_command_areas/admin) "wZ" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red, @@ -6353,6 +6439,12 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"xF" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/stone, +/area/centcom/central_command_areas/admin) "xK" = ( /turf/open/ballpit, /area/centcom/central_command_areas/fore) @@ -6569,6 +6661,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"yM" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "yO" = ( /obj/machinery/computer/communications, /obj/machinery/status_display/evac/directional/north, @@ -6870,9 +6966,8 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) "zQ" = ( -/obj/structure/railing{ - dir = 1 - }, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/mecha_part_fabricator, /turf/open/floor/mineral/titanium/purple, /area/centcom/central_command_areas/admin) "zT" = ( @@ -6900,7 +6995,7 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) "Aa" = ( -/obj/structure/closet, +/obj/machinery/suit_storage_unit/rd, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) "Ab" = ( @@ -7851,10 +7946,6 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) -"Dw" = ( -/obj/item/storage/dice, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "Dx" = ( /obj/item/kirbyplants/random, /turf/open/indestructible/hotelwood, @@ -7978,8 +8069,14 @@ "Eb" = ( /obj/structure/table/reinforced/titaniumglass, /obj/item/storage/box/cups, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) +"Ef" = ( +/obj/structure/table/wood, +/obj/machinery/computer/security/wooden_tv, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/admin) "Eg" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/public/glass{ @@ -8249,6 +8346,9 @@ }, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"Fy" = ( +/turf/open/chasm, +/area/centcom/central_command_areas/admin) "FB" = ( /obj/structure/table/reinforced, /obj/item/storage/box/syringes, @@ -8313,6 +8413,14 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"FQ" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Gabbie's Fax"; + name = "Gabbie's Fax Machine" + }, +/turf/open/floor/stone, +/area/centcom/central_command_areas/admin) "FR" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/vending/dinnerware, @@ -8610,6 +8718,10 @@ /obj/item/dice/d6, /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"Hd" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/centcom/central_command_areas/prison) "He" = ( /obj/structure/table/wood, /obj/item/toy/plush/lizard_plushie, @@ -8747,6 +8859,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/structure/cable, /obj/structure/table/wood, +/obj/item/toy/cards/deck/cas/black{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/toy/cards/deck/cas{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/storage/dice, /turf/open/floor/wood, /area/centcom/central_command_areas/admin) "HR" = ( @@ -9033,6 +9154,7 @@ "Jo" = ( /obj/structure/table/reinforced/titaniumglass, /obj/item/book/manual/wiki/security_space_law, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) "Jq" = ( @@ -9059,9 +9181,10 @@ /turf/open/floor/iron, /area/centcom/tdome/observation) "Jv" = ( -/obj/machinery/door/window{ - dir = 1 - }, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/infinite, /turf/open/floor/mineral/titanium/purple, /area/centcom/central_command_areas/admin) "Jy" = ( @@ -9173,7 +9296,6 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "Kc" = ( -/obj/structure/table/reinforced, /turf/open/floor/mineral/titanium/purple, /area/centcom/central_command_areas/admin) "Kd" = ( @@ -9438,6 +9560,10 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"Lg" = ( +/obj/machinery/vending/wardrobe/cent_wardrobe, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "Li" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -10140,6 +10266,11 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"Ok" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/mob/living/silicon/robot, +/turf/open/floor/mineral/titanium/purple, +/area/centcom/central_command_areas/admin) "Om" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -10180,6 +10311,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/tdome/observation) +"Ou" = ( +/obj/structure/table/wood, +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/admin) "Ov" = ( /obj/effect/spawner/structure/window/reinforced{ max_integrity = 1800 @@ -10759,10 +10897,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) -"Qn" = ( -/obj/structure/mirror/magic, -/turf/closed/indestructible/riveted, -/area/centcom/tdome/observation) "Qp" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -11886,6 +12020,12 @@ dir = 1 }, /area/centcom/central_command_areas/prison) +"Uu" = ( +/obj/item/storage/box/coffeepack/robusta, +/obj/item/storage/box/coffeepack/robusta, +/obj/item/reagent_containers/cup/coffeepot/bluespace, +/turf/open/floor/carpet/royalblue, +/area/centcom/central_command_areas/admin) "Uv" = ( /obj/machinery/chem_heater/debug, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -11900,17 +12040,6 @@ "Ux" = ( /turf/open/indestructible/hierophant, /area/centcom/central_command_areas/admin) -"Uy" = ( -/obj/item/toy/cards/deck/cas{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/toy/cards/deck/cas/black{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron/grimy, -/area/centcom/central_command_areas/admin) "Uz" = ( /turf/open/floor/iron/tgmcemblem{ dir = 4 @@ -12191,15 +12320,26 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"VA" = ( +/obj/machinery/recharge_station, +/turf/open/indestructible/hotelwood, +/area/centcom/central_command_areas/admin) "VB" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/dna_scannernew, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/dark/textured, /area/centcom/central_command_areas/control) +"VD" = ( +/turf/closed/wall/mineral/iron, +/area/centcom/central_command_areas/admin) "VG" = ( /turf/open/floor/carpet/neon/simple/lime/nodots, /area/centcom/tdome/observation) +"VI" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/titanium/purple, +/area/centcom/central_command_areas/admin) "VJ" = ( /obj/structure/window/plasma/spawner/directional/east, /obj/machinery/photocopier/gratis, @@ -12579,6 +12719,11 @@ "Xh" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) +"Xi" = ( +/obj/structure/table/wood, +/obj/machinery/computer/records/security/laptop, +/turf/open/floor/stone, +/area/centcom/central_command_areas/admin) "Xj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -12595,6 +12740,7 @@ /area/centcom/central_command_areas/evacuation) "Xl" = ( /obj/structure/sink/directional/north, +/obj/structure/mirror/directional/south, /turf/open/floor/iron/white, /area/centcom/tdome/observation) "Xm" = ( @@ -12680,6 +12826,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) +"XG" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/admin) "XI" = ( /obj/structure/table/abductor, /turf/open/floor/glass/reinforced, @@ -12764,6 +12916,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Yd" = ( +/obj/structure/closet/crate/science, +/obj/item/clothing/head/beret/science/rd, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "Ye" = ( /obj/structure/flora/bush/pale/style_random, /obj/structure/flora/bush/flowers_pp/style_random, @@ -12784,6 +12941,11 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"Yl" = ( +/obj/machinery/door/airlock/wood, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/wood, +/area/centcom/central_command_areas/admin) "Ym" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/fullgrass/style_random, @@ -13060,6 +13222,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/evacuation/ship) +"Zr" = ( +/obj/structure/chair/sofa/left{ + dir = 4 + }, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "Zs" = ( /obj/machinery/shuttle_manipulator, /turf/open/floor/circuit/green, @@ -13129,6 +13297,7 @@ /area/centcom/tdome/observation) "ZD" = ( /obj/structure/chair/sofa/corp/corner, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) "ZE" = ( @@ -38865,13 +39034,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +On +Zf +Zf +Zf +Zf +On +On aa aa aa @@ -39122,13 +39291,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +On +Vo +XG +Vo +Vo +fC +On aa aa aa @@ -39380,11 +39549,11 @@ Zf Zf On On -On -Zf -Zf -Zf -On +Ef +rD +Ou +Vo +fC On aa aa @@ -39637,11 +39806,11 @@ pi pi Ly On -Tx -pi -pi -pi -Ly +fC +xF +Vo +Vo +fC On aa aa @@ -39894,11 +40063,11 @@ pi pi oT On -gf -hw -pi -pi -oT +Xi +fC +Vo +fC +ds On aa aa @@ -40151,11 +40320,11 @@ NK pi pi On -lQ -eU -NK -pi -pi +hF +fC +Vo +fC +FQ On aa aa @@ -40408,11 +40577,11 @@ hw pi pi On -pi -pp -hw -pi -pi +VD +VD +Yl +VD +VD On aa aa @@ -40665,11 +40834,11 @@ pi pi pi On -pi -pi -pi -pi -pi +Fy +Fy +Xq +Fy +Fy On aa aa @@ -40922,11 +41091,11 @@ pi pi cv On -SI -SI -pi -pi -cv +Fy +Fy +Xq +Fy +Fy On aa aa @@ -41179,11 +41348,11 @@ GZ IS On On -On -On -GZ -IS -On +mv +mv +ll +mv +mv On On On @@ -47861,7 +48030,7 @@ hD cs hD QL -pz +Fm hD Vo Vo @@ -48375,7 +48544,7 @@ hD hD hD FJ -Fm +wo hD cF cF @@ -48616,7 +48785,7 @@ mw Xq gJ Ix -Dw +QV Pi eB On @@ -48632,7 +48801,7 @@ IB IB hD QW -hD +Uu hD cF cF @@ -48873,7 +49042,7 @@ HO Xo Xo Gg -Uy +QV QV oh On @@ -49130,7 +49299,7 @@ Iu Xq Xq Yq -Zh +Xq Xq ef On @@ -49384,7 +49553,7 @@ MU MU MU Xq -Xq +Zh Xm XS Od @@ -50432,7 +50601,7 @@ SJ cF Dx cF -cF +VA cF SJ cF @@ -50943,7 +51112,7 @@ pi pi cv On -uh +Zr wb uh zQ @@ -51200,11 +51369,11 @@ pi pi pi On -uh -uh +id +pe uh Jv -Kc +VI On aa aa @@ -51460,7 +51629,7 @@ On uh uh uh -zQ +Ok Kc On aa @@ -51971,7 +52140,7 @@ pi pi oT On -uh +yM aW uh yg @@ -52033,7 +52202,7 @@ bi bi bi Xl -Qn +QC gT Vr pI @@ -52230,9 +52399,9 @@ Ly On dC Aa -Vc -se -yg +Yd +cd +wY On aa aa @@ -52546,7 +52715,7 @@ Wz lD dB VR -bi +Lg QC Qi oi @@ -57406,7 +57575,7 @@ Ng Ng Ng Ng -Ng +ah LT Ab xo @@ -57902,13 +58071,13 @@ bY bY bY bY +hZ bY bY bY bY bY -bY -bY +hZ bY bY bY @@ -58660,7 +58829,7 @@ aa aa aa il -bY +Hd il aa aa @@ -60202,7 +60371,7 @@ aa aa aa il -bY +Hd il aa aa @@ -61736,12 +61905,12 @@ ke GF bn bY +hZ bY bY bY bY -bY -bY +hZ bY bY bY From 9a9ab29b352ea376d4358f9db616fe092c21a17d Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 8 Oct 2023 12:53:05 -0600 Subject: [PATCH 15/21] office updates admin office updates --- _maps/map_files/generic/CentCom.dmm | 31 +++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 5dafe6527890..2fc6b6687048 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1268,7 +1268,8 @@ /area/centcom/tdome/observation) "fl" = ( /obj/machinery/door/airlock/centcom{ - dir = 4 + dir = 4; + name = "Softie's Office" }, /obj/effect/mapping_helpers/airlock/access/any/admin/captain, /turf/open/floor/carpet/purple, @@ -3351,7 +3352,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, -/obj/effect/spawner/random/special_lighter, +/obj/item/lighter/skull, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) "ms" = ( @@ -4910,6 +4911,7 @@ /area/centcom/central_command_areas/ferry) "se" = ( /obj/structure/table/reinforced, +/obj/item/storage/belt/utility/full/engi, /turf/open/floor/circuit/green, /area/centcom/central_command_areas/admin) "sf" = ( @@ -7792,6 +7794,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/control) +"CN" = ( +/obj/machinery/door/airlock/centcom{ + name = "Vicky's Office" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "CP" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 @@ -8548,7 +8557,7 @@ /area/centcom/central_command_areas/admin/storage) "Gt" = ( /obj/machinery/door/airlock/centcom{ - name = "Master Trapp's Office" + name = "Trapp's Office" }, /obj/effect/mapping_helpers/airlock/access/any/admin/captain, /turf/open/floor/iron/dark, @@ -11214,6 +11223,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"Rt" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/turf/open/floor/carpet/purple, +/area/centcom/central_command_areas/admin) "Ru" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12179,6 +12194,8 @@ /area/centcom/central_command_areas/admin) "Vc" = ( /obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/obj/item/reagent_containers/cup/glass/mug/nanotrasen, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) "Vd" = ( @@ -12942,7 +12959,9 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supply) "Yl" = ( -/obj/machinery/door/airlock/wood, +/obj/machinery/door/airlock/wood{ + name = "Gabbie's Office" + }, /obj/effect/mapping_helpers/airlock/access/any/admin/captain, /turf/open/floor/wood, /area/centcom/central_command_areas/admin) @@ -45190,7 +45209,7 @@ Pl yC yC yg -CS +CN cF cF cF @@ -51883,7 +51902,7 @@ NK pi pi On -Vc +Rt Vc DM se From ff9cc5c251dc5580c957ca496d26cff04c643c6a Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 8 Oct 2023 18:12:19 -0600 Subject: [PATCH 16/21] removed clown grenades removed clown grenade. should be able to also get rid of the badmin payload clown bombs on centcom. if this does not correct, more action will be required. --- _maps/map_files/generic/CentCom.dmm | 44 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2fc6b6687048..e1607137dd93 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1628,7 +1628,9 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "gI" = ( -/obj/structure/statue/gold/rd, +/obj/structure/statue/gold/rd{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "gJ" = ( @@ -2740,17 +2742,6 @@ "kg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/structure/closet/crate/secure/freezer/pizza, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, -/obj/item/grenade/spawnergrenade/clown, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/centcom/central_command_areas/fore) "kh" = ( @@ -4669,7 +4660,9 @@ /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/courtroom) "rd" = ( -/obj/structure/statue/silver/janitor, +/obj/structure/statue/silver/janitor{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "rh" = ( @@ -7591,7 +7584,9 @@ /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) "BT" = ( -/obj/structure/statue/sandstone/assistant, +/obj/structure/statue/sandstone/assistant{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "BU" = ( @@ -8249,7 +8244,9 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) "Fa" = ( -/obj/structure/statue/gold/ce, +/obj/structure/statue/gold/ce{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "Fb" = ( @@ -8502,7 +8499,9 @@ }, /area/centcom/central_command_areas/prison) "Ge" = ( -/obj/structure/statue/gold/hop, +/obj/structure/statue/gold/hop{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "Gf" = ( @@ -9422,7 +9421,9 @@ /turf/closed/wall/mineral/titanium, /area/centcom/central_command_areas/evacuation/ship) "KI" = ( -/obj/structure/statue/gold/cmo, +/obj/structure/statue/gold/cmo{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "KJ" = ( @@ -9867,7 +9868,6 @@ "Mn" = ( /obj/structure/table/wood/fancy/red, /obj/effect/spawner/random/food_or_drink/pizzaparty, -/obj/mystery_box_item, /turf/open/floor/iron/kitchen/diagonal, /area/centcom/central_command_areas/fore) "Mo" = ( @@ -11122,7 +11122,9 @@ /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) "QZ" = ( -/obj/structure/statue/gold/qm, +/obj/structure/statue/gold/qm{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "Ra" = ( @@ -12068,7 +12070,9 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) "UE" = ( -/obj/structure/statue/gold/hos, +/obj/structure/statue/gold/hos{ + anchored = 1 + }, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) "UH" = ( From 755ce51956a8ba1882cc8b2eea72a412014cc178 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:14:37 -0600 Subject: [PATCH 17/21] added lights some lights for arrivals --- _maps/map_files/generic/CentCom.dmm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index e1607137dd93..1832f5af9140 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -4762,6 +4762,7 @@ /area/centcom/central_command_areas/fore) "rD" = ( /obj/structure/table/wood, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/admin) "rF" = ( @@ -5016,6 +5017,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"sA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) "sB" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -10217,6 +10225,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"NX" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron, +/area/centcom/central_command_areas/evacuation) "NZ" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -63764,7 +63777,7 @@ us vh vg Vd -Vd +NX Vd yB vh @@ -65559,15 +65572,15 @@ Yo Yo sT tU +sA tU tU tU +sA tU tU tU -tU -tU -tU +sA tU Bc DK From 34828c93cc8850bec907de3752b560690f5f23c5 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 10 Oct 2023 01:10:39 +0000 Subject: [PATCH 18/21] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-363.yml | 5 ---- html/changelogs/AutoChangeLog-pr-418.yml | 4 --- html/changelogs/AutoChangeLog-pr-426.yml | 6 ----- html/changelogs/AutoChangeLog-pr-428.yml | 10 ------- html/changelogs/AutoChangeLog-pr-430.yml | 4 --- html/changelogs/AutoChangeLog-pr-432.yml | 4 --- html/changelogs/AutoChangeLog-pr-435.yml | 4 --- html/changelogs/AutoChangeLog-pr-437.yml | 8 ------ html/changelogs/archive/2023-10.yml | 34 ++++++++++++++++++++++++ 9 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-363.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-418.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-426.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-428.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-430.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-432.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-435.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-437.yml diff --git a/html/changelogs/AutoChangeLog-pr-363.yml b/html/changelogs/AutoChangeLog-pr-363.yml deleted file mode 100644 index e6f11031bd71..000000000000 --- a/html/changelogs/AutoChangeLog-pr-363.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "KoboldCommando" -delete-after: True -changes: - - bugfix: "dwarf beards and eyes should work properly now" - - bugfix: "giants use the new height system and look a bit less distorted" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-418.yml b/html/changelogs/AutoChangeLog-pr-418.yml deleted file mode 100644 index 7e13dee9932c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-418.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DrDiasyl aka DrTuxedo" -delete-after: True -changes: - - balance: "Holsters can now be clipped to any suit, and house Captain antique gun and HoS gun. You now can buy holsters from the SecTech premium section." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-426.yml b/html/changelogs/AutoChangeLog-pr-426.yml deleted file mode 100644 index 9a0e1f0e0119..000000000000 --- a/html/changelogs/AutoChangeLog-pr-426.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "lmenvs" -delete-after: True -changes: - - bugfix: "various oshan fixes" - - rscadd: "new conveyor/auto/inside_corners for the missing directional sprites." - - rscadd: "new wrestling railing." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-428.yml b/html/changelogs/AutoChangeLog-pr-428.yml deleted file mode 100644 index 38c75a4d5b6c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-428.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: "wraith-54321" -delete-after: True -changes: - - bugfix: "eminence linked abscond and purge reagents can now actually be used again" - - bugfix: "vitality matrix servant revival" - - balance: "default max servants is now 10 again" - - balance: "replica fabricators now build slower on reebe until the cult has stabilized their first anchoring crystal" - - balance: "clockwork bows deal double damage to non clockwork machines and structures" - - balance: "kindle will now only have less effect on reebe if the ark is active" - - balance: "the crew now has 30 extra seconds to prepare before the portals open" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-430.yml b/html/changelogs/AutoChangeLog-pr-430.yml deleted file mode 100644 index 9aac974ecbb4..000000000000 --- a/html/changelogs/AutoChangeLog-pr-430.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "KoboldCommando" -delete-after: True -changes: - - sound: "tweaked the new surgery sound" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-432.yml b/html/changelogs/AutoChangeLog-pr-432.yml deleted file mode 100644 index 992e18ae3ff6..000000000000 --- a/html/changelogs/AutoChangeLog-pr-432.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Glyphee" -delete-after: True -changes: - - rscadd: "placeholder screams" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-435.yml b/html/changelogs/AutoChangeLog-pr-435.yml deleted file mode 100644 index 5818f06b0046..000000000000 --- a/html/changelogs/AutoChangeLog-pr-435.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Salted-Zen" -delete-after: True -changes: - - rscadd: "Added medical eyepatch and mask to monkey store" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-437.yml b/html/changelogs/AutoChangeLog-pr-437.yml deleted file mode 100644 index 9f1eb2f46904..000000000000 --- a/html/changelogs/AutoChangeLog-pr-437.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "Dexee" -delete-after: True -changes: - - qol: "Evidence lockers on Tramstation now numbered correctly" - - qol: "Two evidence lockers swapped on Tramstation for their secure counterparts to match other stations." - - qol: "Scrubber and Vent pipes by arrivals on lower Z now properly connect on Tramstation" - - qol: "Added a missing multi-Z cable hub to the bridge on Tramstation. The vault has power again!" - - rscdel: "Removed an errant directional plasmaglass window by the SM cooling loop on Deltastation." \ No newline at end of file diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index c7e3afbf3f20..736a4601a19e 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -26,3 +26,37 @@ NicoDeLuna: - rscadd: 'New Hat: Small But Knowing Clown hat' - rscadd: 'New suit: Small But Knowing Clown suit' +2023-10-10: + Dexee: + - qol: Evidence lockers on Tramstation now numbered correctly + - qol: Two evidence lockers swapped on Tramstation for their secure counterparts + to match other stations. + - qol: Scrubber and Vent pipes by arrivals on lower Z now properly connect on Tramstation + - qol: Added a missing multi-Z cable hub to the bridge on Tramstation. The vault + has power again! + - rscdel: Removed an errant directional plasmaglass window by the SM cooling loop + on Deltastation. + DrDiasyl aka DrTuxedo: + - balance: Holsters can now be clipped to any suit, and house Captain antique gun + and HoS gun. You now can buy holsters from the SecTech premium section. + Glyphee: + - rscadd: placeholder screams + KoboldCommando: + - bugfix: dwarf beards and eyes should work properly now + - bugfix: giants use the new height system and look a bit less distorted + - sound: tweaked the new surgery sound + Salted-Zen: + - rscadd: Added medical eyepatch and mask to monkey store + lmenvs: + - bugfix: various oshan fixes + - rscadd: new conveyor/auto/inside_corners for the missing directional sprites. + - rscadd: new wrestling railing. + wraith-54321: + - bugfix: eminence linked abscond and purge reagents can now actually be used again + - bugfix: vitality matrix servant revival + - balance: default max servants is now 10 again + - balance: replica fabricators now build slower on reebe until the cult has stabilized + their first anchoring crystal + - balance: clockwork bows deal double damage to non clockwork machines and structures + - balance: kindle will now only have less effect on reebe if the ark is active + - balance: the crew now has 30 extra seconds to prepare before the portals open From 427ea693983b9cd89b769690d93affa456d2abc7 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:43:27 -0600 Subject: [PATCH 19/21] ooks office ooks office is now furnished. absolute gamer legend. --- _maps/map_files/generic/CentCom.dmm | 166 ++++++++++++++++++++++------ 1 file changed, 134 insertions(+), 32 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 1832f5af9140..8910f160db04 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -133,6 +133,10 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) +"aD" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/iron/white, +/area/centcom/tdome/observation) "aE" = ( /obj/structure/sign/poster/contraband/clown{ pixel_y = 3 @@ -198,6 +202,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"aS" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/item/book/manual/wiki/tcomms{ + name = "How to Become a Billionaire"; + desc = "Huh... I don't think any of us expected there to be a totally legit guide to this." + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "aV" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -436,6 +449,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation/ship) +"bO" = ( +/obj/machinery/door/airlock/centcom{ + dir = 4; + name = "Ook's Streamer Den" + }, +/obj/effect/mapping_helpers/airlock/access/any/admin/captain, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "bP" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; @@ -923,6 +944,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"dU" = ( +/obj/structure/closet/crate/bin, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "dV" = ( /obj/structure/table/wood, /obj/machinery/status_display/evac/directional/north, @@ -1627,6 +1652,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"gH" = ( +/obj/item/stack/cannonball, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "gI" = ( /obj/structure/statue/gold/rd{ anchored = 1 @@ -1779,6 +1808,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"hp" = ( +/obj/machinery/ntnet_relay{ + name = "Ook's Modem"; + is_operational = 0; + desc = "A very complex router and transmitter capable of connecting electronic devices together. Did Ook somehow steal this hunk of junk from NT or something??" + }, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "hq" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -1834,6 +1871,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"hA" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "hC" = ( /obj/structure/dresser, /turf/open/floor/iron/white, @@ -3735,6 +3776,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/fore) +"nO" = ( +/obj/structure/cannon{ + dir = 4; + desc = "Resort to the cannon at the top of the stairs loaded with GRAPESHOT!" + }, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "nR" = ( /obj/structure/closet/wardrobe/miner, /turf/open/floor/iron/white, @@ -5496,6 +5544,9 @@ "uh" = ( /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"uk" = ( +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "um" = ( /obj/machinery/computer/communications{ dir = 1 @@ -6193,6 +6244,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"wQ" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/item/banhammer{ + desc = "A terrible weapon that has seen countless use over the ages. It looks like Ook doesn't use this thing much. A good thing for you guys!"; + force = -10 + }, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "wR" = ( /obj/machinery/vending/wardrobe/medi_wardrobe{ default_price = 0; @@ -6458,6 +6517,11 @@ "xO" = ( /turf/open/floor/iron/kitchen/herringbone, /area/centcom/central_command_areas/fore) +"xP" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/bananalamp, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "xQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light/directional/south, @@ -6612,6 +6676,13 @@ }, /turf/open/floor/plating, /area/centcom/central_command_areas/ghost_spawn) +"yw" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/civilian{ + desc = "A low-end laptop often used for personal recreation. Looks like Ook's gaming computer. Thankfully these things are at least somewhat robust." + }, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "yy" = ( /obj/machinery/light/directional/east, /obj/machinery/status_display/evac/directional/east, @@ -7804,6 +7875,10 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/captain, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"CO" = ( +/obj/structure/fireaxecabinet/directional/north, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "CP" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 @@ -9155,6 +9230,9 @@ }, /turf/open/indestructible/event/plating, /area/centcom/tdome/arena/actual) +"Ji" = ( +/turf/open/floor/carpet/neon/simple/white, +/area/centcom/central_command_areas/admin) "Jj" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -11331,6 +11409,13 @@ /obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) +"RK" = ( +/obj/machinery/modular_computer/console/preset/id/centcom{ + dir = 1; + desc = "A specialized console to connect to gaming computers to be able to broadcast live. Seriously, where does Ook find this stuff?" + }, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "RL" = ( /obj/machinery/door/airlock/freezer, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, @@ -11390,6 +11475,15 @@ /obj/structure/punching_bag, /turf/open/floor/grass/fairy, /area/centcom/central_command_areas/admin) +"RZ" = ( +/obj/structure/chair/bronze{ + name = "gamer chair mk2" + }, +/obj/item/toy/plush/moth/ookplush{ + name = "Ook" + }, +/turf/open/floor/carpet/neon/simple/white, +/area/centcom/central_command_areas/admin) "Sb" = ( /turf/open/floor/wood, /area/centcom/tdome/observation) @@ -11527,6 +11621,14 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"SD" = ( +/obj/machinery/blackbox_recorder{ + name = "Ook's Backups"; + desc = "Huh, who would've thought Ook used tape drives to keep his data backed up safe and sound!" + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "SF" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -39836,11 +39938,11 @@ pi pi Ly On -Tx -pi -pi -pi -Ly +hA +gH +nO +uk +hp On fC xF @@ -40093,11 +40195,11 @@ pi pi oT On -gf -hw -pi -pi -oT +SD +uk +uk +uk +RK On Xi fC @@ -40350,11 +40452,11 @@ NK pi pi On -lQ -eU -NK -pi -pi +CO +uk +Ji +RZ +yw On hF fC @@ -40607,11 +40709,11 @@ hw pi pi On -pi -pp -hw -pi -pi +wQ +uk +Ji +uk +xP On VD VD @@ -40864,11 +40966,11 @@ pi pi pi On -pi -pi -pi -pi -pi +aS +uk +Ji +uk +uk On Fy Fy @@ -41121,11 +41223,11 @@ pi pi cv On -SI -SI -pi -pi -cv +uk +uk +Ji +uk +dU On Fy Fy @@ -41380,7 +41482,7 @@ On On On On -GZ +bO IS On On @@ -52234,7 +52336,7 @@ gy eL PU ZV -bi +aD bi bi Xl From f3920d59be7be57bb9205fc2aee57d33e7e49ccf Mon Sep 17 00:00:00 2001 From: lmenvs <85052537+lmenvs@users.noreply.github.com> Date: Tue, 10 Oct 2023 21:59:14 -0700 Subject: [PATCH 20/21] test (#442) * test * replaced --------- Co-authored-by: DESKTOP-M4GD565\LME --- .../screenshot_antag_icons_cyberpolice.png | Bin 677 -> 648 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_cyberpolice.png index ac8a6347bbd71ffa772df99c026a1fb85e1973d8..2a2adf34765a8505f17f88af31d14675bca0ce62 100644 GIT binary patch delta 526 zcmV+p0`dK&1&9TZB!5~^OjJbx007#alKIib|KQQ;zqC?7JsBApt*xzHR8QfrrT_o{ zynAtUae@>T8Xq7g%gxcHskS#aJ}oUX|NsA)nVITGHjSCQW2Z{*pa<;+*zrwh(Ebl>8RS!Uy7%VYog7pRLWnI^g0Kwd7y2N0e zqtDwHkfv!Ehi_bke-(pGmUI&&@&r!)i*T1QeB*)^IOm=LQrQE#aEC#MITNfaP`Fd+ zx{fC&N*4xO6%(u^z{5w-0||y9y`eS!D>1E73@b3Nc1A0A;bK~905IM-x9U%o5BvIpZhegTwmohF-L?qE7E zbtLLtdO9HWW~cvWNfN_Na4BuT1(Z6y&mc6!4(Z(4W8Lh3Y zT~truuciP10RQ08ynAtUae^5e9ug83rKz?fBPlB@G0V--?(Xg(AR;d=F&P*do2|FY z+x&)*36_zEfPaihL_t(&f$f*=QiCuMMWI$yM3Kms;`=|Rce}Tf?WjZ1Fiy*!KM5q< z<77#SS>`y7<6IfJ;)4GWAa$qQfIUDrrR%Za38@{sv5Xp7Kua711QV#5wI(@#+VD%7hp>jRex1I0R%q-c5$=9mN8W}PJ61!wXC%vpr1gy9!1Xg~-6@bg zUwpdqTtU( zcEOJhNtdoUXX4A>oSs*doEh$drI;@hBZ%KLza&e&DuMZGu+ R^Me2Y002ovPDHLkV1k|8?@<5% From 4a76d059745d00ce15ab3ee77a7db6fb2bb154e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:49:27 +0000 Subject: [PATCH 21/21] Automatic changelog for PR #423 [ci skip] --- html/changelogs/AutoChangeLog-pr-423.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-423.yml diff --git a/html/changelogs/AutoChangeLog-pr-423.yml b/html/changelogs/AutoChangeLog-pr-423.yml new file mode 100644 index 000000000000..cf23bbe0ebcc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-423.yml @@ -0,0 +1,22 @@ +author: "Dexee" +delete-after: True +changes: + - rscadd: "AdminLand, the land of Admin Offices" + - rscadd: "Dressing Room, version 1 (various vendors, selection of lockers, subject to change based on feedback, now with magic mirror!)" + - qol: "CentCom Auxiliary Announcement closet moved to AdminLand (Anti-Tide), also now has a light." + - qol: "old CentCom Administrative Office retained, moved to sit with AdminLand as The Council Chambers" + - qol: "Expanded the bar/kitchen by Thunderdome, complete with extra table space, vendors and trash bins as appropriate" + - rscdel: "removed all CE belts from the map" + - rscdel: "removed the CE room by arrivals" + - qol: "moved Poly Prime. Can't let the bird die" + - qol: "fixed the improper cloning bay arrangement in CC Medical" + - rscdel: "removed the CC Medical Mechbay and Odysseus (the damn thing had nothing on it anyway)" + - qol: "increased the strength of various doors and windows to help provide a passive enforcement mechanism to CC Ghost Interns of where they are allowed to be." + - qol: "moved minigame start markers for Mafia and Basketball to open up space next to CentCom (does not require code changes, tested locally)" + - qol: "moved CC Cargo to a tenative better position, mostly to allow for room for AdminLand, but also provides Anti-Tide." + - qol: "gave a big window to Peppino's so viewers can enjoy our nice space backgrounds" + - qol: "Tiny Fans added under the arrivals blast doors by the shuttle to help mitigate depressurization events during EORG... not that it'll make a huge difference, but worth the change." + - qol: "toned down how many cooking pots and ladles there are at the CC Kitchen." + - qol: "kicked one microwave out of the way to add a dedicated rack with chef clothing items at CC Kitchen." + - rscdel: "removed barkeep powergaming shotgun at CC Bar." + - rscdel: "removed Detroit." \ No newline at end of file