From 312814a0c4ea68c82fcb18119eaa2ae4a8cb7d04 Mon Sep 17 00:00:00 2001 From: SueTheCake Date: Thu, 15 Aug 2019 05:10:04 -0500 Subject: [PATCH] Forensic Lab Changes (#6843) * Edits the Forensics Office to have much more space and necessary fluff tools for proper autopsy work and laboratory work. --- html/changelogs/sue.yml | 41 + maps/aurora/aurora-5_interstitial.dmm | 1284 +++++++++++++++---------- 2 files changed, 795 insertions(+), 530 deletions(-) create mode 100644 html/changelogs/sue.yml diff --git a/html/changelogs/sue.yml b/html/changelogs/sue.yml new file mode 100644 index 00000000000..7454e4b1322 --- /dev/null +++ b/html/changelogs/sue.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Sue + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Remapped the forensics office and autopsy lab." diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index c89aae90f57..0c6d3526768 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -205,6 +205,14 @@ "ar" = ( /turf/simulated/wall/r_wall, /area/maintenance/interstitial_main) +"as" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/machinery/computer/records/security, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "at" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -231,6 +239,17 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/maintenance/interstitial_main) +"av" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + icon_state = "map-scrubbers"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "aw" = ( /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) @@ -266,6 +285,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/interstitial_main) +"aA" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "aB" = ( /turf/simulated/floor/airless{ icon_state = "asteroidplating" @@ -3080,82 +3110,59 @@ /area/security/forensics_office) "fO" = ( /obj/structure/table/standard, -/obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"fP" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 5 - }, /obj/machinery/light{ - dir = 1 + dir = 8 + }, +/obj/item/device/camera_film, +/obj/item/device/camera, +/obj/machinery/requests_console{ + department = "Forensic Technician"; + departmentType = 5; + pixel_x = -32; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 }, /turf/simulated/floor/tiled, /area/security/forensics_office) "fQ" = ( -/obj/structure/table/standard, -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 5 +/obj/structure/disposalpipe/segment{ + icon_state = "conpipe-c"; + dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 23 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 1 }, /turf/simulated/floor/tiled, /area/security/forensics_office) "fR" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/evidence{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/weapon/storage/box/bodybags, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; - dir = 5 + dir = 6 }, -/obj/machinery/requests_console{ - department = "Forensic Technician"; - departmentType = 5; - pixel_x = 0; - pixel_y = 32 - }, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"fS" = ( -/obj/machinery/computer/records/security, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 5 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, /turf/simulated/floor/tiled, /area/security/forensics_office) "fT" = ( -/obj/machinery/computer/records/medical, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 5 +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/swabs{ + pixel_x = 5; + pixel_y = 5 }, -/turf/simulated/floor/tiled, +/obj/item/weapon/storage/fancy/vials, +/turf/simulated/floor/tiled/white, /area/security/forensics_office) "fU" = ( -/obj/structure/table/standard, -/obj/item/weapon/folder/sec, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 5 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/machinery/dnaforensics, +/turf/simulated/floor/tiled/white, /area/security/forensics_office) "fV" = ( /obj/machinery/door/firedoor, @@ -3351,28 +3358,20 @@ /turf/simulated/floor/tiled, /area/security/forensics_office) "gl" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/forensics_office) "gm" = ( -/obj/structure/bed/chair/office/light{ +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/button/windowtint{ - id = "FT Op"; - pixel_x = 28; - pixel_y = 12 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"gn" = ( -/obj/structure/table/standard, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, /area/security/forensics_office) "go" = ( /obj/machinery/door/firedoor, @@ -3489,10 +3488,6 @@ /turf/simulated/floor/tiled, /area/security/investigations) "gx" = ( -/obj/machinery/door/airlock/security{ - name = "Forensic Technician"; - req_access = list(4) - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -3508,16 +3503,24 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_security{ + name = "Forensic Technician"; + req_access = list(4) + }, /turf/simulated/floor/tiled, /area/security/forensics_office) "gy" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 }, /obj/structure/cable/green{ - d1 = 4; + d1 = 1; d2 = 8; - icon_state = "4-8" + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3531,75 +3534,41 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/security/forensics_office) "gA" = ( /obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - icon_state = "map-scrubbers"; - dir = 1 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/forensics_office) "gB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/closet{ + name = "Evidence Closet" }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"gC" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 }, /turf/simulated/floor/tiled, /area/security/forensics_office) "gD" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/tiled/white, /area/security/forensics_office) "gE" = ( /obj/machinery/door/firedoor, @@ -3792,11 +3761,23 @@ /turf/simulated/floor/tiled, /area/security/investigations) "gR" = ( -/obj/structure/coatrack, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 10 }, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/coatrack, +/obj/machinery/camera/network/security{ + c_tag = "Security - Forensics Office"; + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = 0 @@ -3804,7 +3785,6 @@ /turf/simulated/floor/tiled, /area/security/forensics_office) "gS" = ( -/obj/structure/closet/secure_closet/csi, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 10 @@ -3812,6 +3792,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/closet/secure_closet/csi, /turf/simulated/floor/tiled, /area/security/forensics_office) "gT" = ( @@ -3825,53 +3806,46 @@ /area/security/forensics_office) "gU" = ( /obj/machinery/photocopier, +/obj/machinery/firealarm/south, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; dir = 10 }, -/obj/machinery/camera/network/security{ - c_tag = "Security - Forensics Office"; - dir = 1 - }, /turf/simulated/floor/tiled, /area/security/forensics_office) "gV" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 10 +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/firealarm/south, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"gW" = ( -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 10 - }, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/green, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/security/forensics_office) -"gX" = ( -/obj/machinery/disposal, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 10 - }, -/obj/structure/disposalpipe/trunk{ +/obj/structure/window/reinforced{ + icon_state = "rwindow"; dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, +/area/security/forensics_office) +"gW" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/machinery/microscope, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) +"gX" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/machinery/camera/network/security{ + c_tag = "Security - Forensics Laboratory"; + dir = 1 + }, +/obj/machinery/light, +/obj/item/device/reagent_scanner, +/turf/simulated/floor/tiled/white, /area/security/forensics_office) "gY" = ( /obj/effect/floor_decal/corner/blue{ @@ -4111,42 +4085,18 @@ }, /turf/simulated/floor/tiled, /area/security/investigations) -"hm" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/security/forensics_office) -"hn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/security/forensics_office) "ho" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_security{ - name = "Forensic Laboratory"; +/obj/structure/plasticflaps/airtight{ + layer = 2.5 + }, +/obj/machinery/door/airlock/security{ + name = "Autopsy Lab"; req_access = list(4) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled, /area/security/forensics_office) "hp" = ( /obj/structure/grille, @@ -4299,64 +4249,20 @@ }, /turf/simulated/floor/tiled, /area/security/investigations) -"hA" = ( -/obj/structure/table/glass, -/obj/item/weapon/storage/box/swabs{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/weapon/storage/box/syringes, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 9 - }, -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) -"hB" = ( -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) "hC" = ( -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) -"hD" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/structure/morgue, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) -"hE" = ( -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/machinery/button/windowtint{ - id = "FT Op"; - pixel_x = 0; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/ramp/bottom, /area/security/forensics_office) "hF" = ( -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/structure/table/glass, -/obj/item/weapon/autopsy_scanner, -/obj/item/weapon/scalpel{ - desc = "Cut, cut, and once more cut. This one is extra shiny!"; - name = "shiny scalpel" +/obj/structure/morgue{ + icon_state = "morgue1"; + dir = 2 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 }, -/turf/simulated/floor/tiled/white, /area/security/forensics_office) "hG" = ( /obj/effect/floor_decal/corner/blue{ @@ -4468,54 +4374,28 @@ }, /turf/simulated/floor/tiled, /area/security/investigations) -"hT" = ( -/obj/structure/table/glass, -/obj/item/weapon/storage/box/slides{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/weapon/storage/fancy/vials, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 9 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) -"hU" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) "hV" = ( -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 +/obj/structure/window/reinforced, +/obj/machinery/light/small{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/security/forensics_office) "hW" = ( /obj/effect/floor_decal/corner/beige/diagonal, /turf/simulated/floor/tiled/white, /area/security/forensics_office) "hX" = ( -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/machinery/optable, -/obj/machinery/light{ - icon_state = "tube1"; - dir = 4 +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 }, -/turf/simulated/floor/tiled/white, /area/security/forensics_office) "hY" = ( /obj/machinery/door/airlock/medical{ @@ -4595,39 +4475,15 @@ }, /turf/simulated/floor/plating, /area/security/investigations) -"ie" = ( -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 9 - }, -/obj/machinery/firealarm/west, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) "if" = ( -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 +/obj/structure/table/standard, +/obj/item/weapon/storage/box/bodybags, +/obj/machinery/firealarm/west, +/obj/item/device/healthanalyzer, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) -"ig" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 8 - }, -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/structure/table/glass, -/obj/item/weapon/storage/box/masks{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/weapon/storage/box/gloves, -/obj/machinery/camera/network/security{ - c_tag = "Security - Forensics Laboratory"; - dir = 1 - }, -/turf/simulated/floor/tiled/white, /area/security/forensics_office) "ih" = ( /obj/effect/floor_decal/corner/green/full{ @@ -4646,51 +4502,13 @@ "ii" = ( /turf/simulated/open, /area/security/training) -"ij" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "FT Op" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "FT Op" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "FT Op" - }, -/obj/structure/window/reinforced/polarized{ - id = "FT Op" - }, -/turf/simulated/floor/plating, -/area/security/forensics_office) -"ik" = ( -/obj/structure/table/glass, -/obj/machinery/microscope, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) -"il" = ( -/obj/machinery/dnaforensics, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) "im" = ( -/obj/structure/closet{ - name = "Evidence Closet" +/obj/structure/table/standard, +/obj/machinery/computer/records/medical/laptop, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 }, -/obj/effect/floor_decal/corner/blue{ - icon_state = "corner_white"; - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, /area/security/forensics_office) "in" = ( /obj/machinery/door/firedoor, @@ -6915,19 +6733,6 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/medical/psych) -"mn" = ( -/obj/effect/floor_decal/corner/beige/diagonal, -/obj/structure/table/glass, -/obj/item/device/mass_spectrometer{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/device/reagent_scanner{ - pixel_x = 1; - pixel_y = -1 - }, -/turf/simulated/floor/tiled/white, -/area/security/forensics_office) "mo" = ( /turf/simulated/mineral, /area/mine/unexplored) @@ -7021,6 +6826,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/upperlevel) +"mA" = ( +/obj/structure/sink/kitchen{ + dir = 8; + icon_state = "sink_alt"; + name = "Autopsy sink"; + pixel_x = 20 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "mG" = ( /obj/structure/cable{ d1 = 4; @@ -7183,6 +7000,17 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/medical/virology) +"nL" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/machinery/light{ + dir = 4; + status = 0 + }, +/obj/item/device/mass_spectrometer, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "nN" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -7324,6 +7152,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/virology) +"pe" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/table/standard, +/obj/item/weapon/folder/sec, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "pj" = ( /obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; @@ -7401,6 +7241,19 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, /area/maintenance/interstitial_construction_site) +"pH" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/slides{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/storage/box/syringes, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "pO" = ( /obj/effect/floor_decal/corner/lime{ icon_state = "corner_white"; @@ -7488,6 +7341,13 @@ /obj/machinery/computer/records/medical/laptop, /turf/simulated/floor/tiled/white, /area/medical/virology) +"qv" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "qG" = ( /obj/machinery/disposal{ name = "MediExpress - Quarantine" @@ -7662,6 +7522,16 @@ /obj/machinery/pipedispenser/disposal, /turf/simulated/floor/airless, /area/maintenance/interstitial_construction_site) +"sk" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "sl" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; @@ -7731,6 +7601,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/telecoms_ladder) +"sA" = ( +/obj/structure/closet{ + name = "Evidence Closet" + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "sK" = ( /obj/structure/cable{ d1 = 1; @@ -7968,6 +7847,15 @@ }, /turf/unsimulated/floor/asteroid/ash/rocky, /area/mine/unexplored) +"uw" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "uD" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -8054,6 +7942,14 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/virology) +"vf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "vk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/freezer{ @@ -8114,6 +8010,25 @@ /obj/structure/lattice/catwalk, /turf/simulated/open, /area/maintenance/medbay_interstitial) +"vV" = ( +/obj/structure/table/standard, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/item/stack/packageWrap, +/obj/item/weapon/hand_labeler, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "wd" = ( /obj/item/weapon/storage/briefcase/inflatable, /obj/structure/table/rack{ @@ -8179,6 +8094,13 @@ }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) +"wO" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "wT" = ( /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -8202,6 +8124,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"wU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "wY" = ( /turf/unsimulated/floor/asteroid/ash/rocky, /area/maintenance/interstitial_construction_site/zone_2) @@ -8285,6 +8219,13 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"yi" = ( +/obj/structure/closet/crate/freezer, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "yj" = ( /obj/structure/cable/green{ d1 = 4; @@ -8304,6 +8245,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/interstitial_construction_site/zone_2) +"yq" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "yw" = ( /obj/structure/track{ icon_state = "track12" @@ -8442,6 +8396,19 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"zD" = ( +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/ramp/bottom{ + icon_state = "rampbot"; + dir = 4 + }, +/area/security/forensics_office) "zQ" = ( /obj/effect/floor_decal/corner/green{ icon_state = "corner_white_full" @@ -8671,6 +8638,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/maintenance/interstitial_construction_site/office) +"CJ" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/sharps, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "CN" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9245,6 +9218,12 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"HA" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "HC" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Construction Level" @@ -9458,6 +9437,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay_interstitial) +"IA" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/camera/network/security{ + c_tag = "Security - Forensics Autopsy Chamber"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "IC" = ( /obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; @@ -9517,6 +9509,23 @@ }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) +"IN" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/evidence{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/storage/briefcase/crimekit, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "IP" = ( /obj/effect/floor_decal/corner/yellow{ icon_state = "corner_white"; @@ -9716,6 +9725,21 @@ }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) +"Jk" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 8 + }, +/turf/simulated/floor/plating, +/area/security/forensics_office) "Jm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -9921,6 +9945,16 @@ }, /turf/simulated/floor/plating, /area/medical/virologyaccess) +"JX" = ( +/obj/structure/table/standard, +/obj/item/weapon/hemostat, +/obj/item/weapon/retractor, +/obj/item/weapon/circular_saw, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "Kd" = ( /obj/structure/cable/green{ d1 = 4; @@ -10514,6 +10548,13 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"LF" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "LK" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -10762,6 +10803,13 @@ /obj/random/tech_supply, /turf/unsimulated/floor/asteroid/ash/rocky, /area/maintenance/interstitial_construction_site) +"Oa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "Om" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, @@ -10774,6 +10822,22 @@ /obj/effect/floor_decal/sign/p, /turf/simulated/floor/tiled/white, /area/medical/upperlevel) +"Oq" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/obj/machinery/button/windowtint{ + id = "FT Op"; + pixel_x = 28; + pixel_y = 12 + }, +/obj/machinery/light{ + dir = 4; + status = 0 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "Oz" = ( /turf/simulated/floor/plating, /area/maintenance/substation/interstitial) @@ -10798,6 +10862,18 @@ /obj/structure/grille, /turf/simulated/floor/airless, /area/maintenance/interstitial_construction_site/zone_2) +"OI" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "ON" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10852,6 +10928,14 @@ /obj/structure/lattice, /turf/unsimulated/floor/asteroid/ash/rocky, /area/maintenance/interstitial_construction_site) +"OY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 1 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "Pp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10890,6 +10974,22 @@ }, /turf/simulated/floor/tiled, /area/maintenance/interstitial_main) +"Pu" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/weapon/pen{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/pen/red, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "PA" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/lime{ @@ -10908,6 +11008,23 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/medical/virology) +"PC" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/table/standard, +/obj/item/weapon/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/weapon/pen{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/pen/red, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "PJ" = ( /obj/structure/cable/green{ d1 = 4; @@ -10925,6 +11042,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virologyaccess) +"PP" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_security{ + name = "Forensic Laboratory"; + req_access = list(4) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "PX" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/lime/full, @@ -10935,6 +11067,11 @@ /obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/white, /area/medical/virology) +"Qc" = ( +/obj/effect/floor_decal/corner/beige/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/security/forensics_office) "Qp" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced, @@ -11465,6 +11602,22 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"Uh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/alarm/cold{ + pixel_x = 0; + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "Ui" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ @@ -11644,6 +11797,26 @@ /obj/structure/closet/l3closet/virology, /turf/simulated/floor/tiled/white, /area/medical/virology) +"UY" = ( +/obj/machinery/optable{ + name = "Autopsy Table" + }, +/obj/effect/decal/warning_stripes, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) +"UZ" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "Vv" = ( /obj/effect/floor_decal/corner/lime/full, /obj/structure/extinguisher_cabinet{ @@ -11763,6 +11936,14 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/medical/upperlevel) +"Wn" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/machinery/computer/records/medical, +/turf/simulated/floor/tiled, +/area/security/forensics_office) "Wo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11873,6 +12054,19 @@ /obj/random/loot, /turf/simulated/floor/airless, /area/maintenance/interstitial_construction_site) +"Xd" = ( +/obj/structure/table/standard, +/obj/item/weapon/autopsy_scanner, +/obj/item/weapon/scalpel{ + desc = "Cut, cut, and once more cut. This one is extra shiny!"; + name = "shiny scalpel" + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "Xn" = ( /obj/structure/cable/green{ d1 = 2; @@ -12007,6 +12201,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/upperlevel) +"Yg" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "Yo" = ( /obj/machinery/power/sensor{ long_range = 1; @@ -12047,6 +12250,27 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"Yx" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/box/masks{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/weapon/storage/box/gloves, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) +"Yy" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/security/forensics_office) "YA" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -49059,23 +49283,23 @@ aa ab ab ab -ab -ab -ab fw fN gj +fw +fw +fw gx fw fw fw fw fw -ij -fw ab ab -aa +ab +ab +ab aa aa aa @@ -49316,23 +49540,23 @@ aa aa aa aa -ab -ab -ab fx +pe +Wn +as fO -gk +vV gy gR -hm -hA -hT -ie -ik -fx +fw +fw +fw +fw +ab +ab +ab ab ab -aa aa aa aa @@ -49573,24 +49797,24 @@ aa aa aa aa -aa -ab -ab -fy -fP +in +wO +HA +gk +gk gl gz gS -hn -hB -hU -hB -il -in +fw +fw +fw +fw +fw +fw +fw +ab ab ab -aa -aa aa aa aa @@ -49830,12 +50054,12 @@ aa aa aa aa -ab -ab -ab -fw +in +PC +Oa +OY fQ -gk +av gA gT ho @@ -49843,11 +50067,11 @@ hC hV if im -fy +Pu +fw +ab ab ab -aa -aa aa aa aa @@ -50087,23 +50311,23 @@ aa aa aa aa -aa -ab -ab -fw +fy +OI +LF +Oq fR -gk +yq gB gU -hp -hD -hW -ig +fw +fw +zD +hX +Yy +IA fw fw ab -ab -aa aa aa aa @@ -50344,23 +50568,23 @@ aa aa aa aa -aa -ab -ab fw -fS -gk -gB +fN +gj +fw +hp +PP +Jk gV fw -hE -hW -hW -fx +fw +Uh +vf +vf +wU +JX +fw ab -ab -ab -aa aa aa aa @@ -50607,18 +50831,18 @@ ab fx fT gm -gC +hW gW fw hF hX -mn -fy +qv +UY +Yg +Xd +fw ab ab -ab -ab -aa aa aa aa @@ -50858,23 +51082,23 @@ aa aa aa aa -aa ab ab -fy +ab +in fU -gn +gm gD gX fw -fN -go -gj +hF +hX +hX +hX +hX +Yx fw ab -ab -ab -ab aa aa aa @@ -51115,22 +51339,22 @@ aa aa aa aa -aa ab ab +ab +in +uw +sk +Qc +aA +fw +fw +sA +UZ +mA +yi fw -fN -go -go -gj fw -ab -ab -ab -ab -ab -ab -ab mo mo aa @@ -51372,21 +51596,21 @@ aa aa aa aa -aa -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab ab ab ab +fy +pH +nL +CJ +IN +fw +fw +fw +fw +fw +fw +fw mo mo mo @@ -51629,16 +51853,16 @@ aa aa aa aa -aa -ab -ab -ab -ab -ab -ab ab ab ab +fw +fN +go +go +gj +fw +mo mo mo mo @@ -51893,6 +52117,7 @@ ab ab ab ab +ab mo mo mo @@ -51909,7 +52134,6 @@ aa aa aa aa -aa ff ff ff @@ -52152,15 +52376,15 @@ ab aa mo mo -bT -bT -bT -bT -bT -bT -bT mo mo +mo +mo +mo +mo +mo +mo +aa aa aa aa @@ -52408,13 +52632,13 @@ aa aa aa mo +mo +bT +bT +bT +bT bT bT -bU -cQ -cQ -cQ -cT bT mo mo @@ -52666,12 +52890,12 @@ aa aa mo bT +bT bU -cN -bT -bT -cS -cU +cQ +cQ +cQ +cT bT mo mo @@ -52923,15 +53147,15 @@ aa aa mo bT -co -bT -bT +bU +cN bT bT +cS cU bT mo -aa +mo aa aa aa @@ -53180,8 +53404,8 @@ aa aa mo bT -ct -cP +co +bT bT bT bT @@ -53437,12 +53661,12 @@ aa aa mo bT -bT ct -cR -cR -cR -cV +cP +bT +bT +bT +cU bT mo aa @@ -53693,13 +53917,13 @@ aa aa aa mo -mo -bT -bT -bT -bT bT bT +ct +cR +cR +cR +cV bT mo aa @@ -53949,16 +54173,16 @@ aa aa aa aa -aa mo -ab -ab -ab -ab -ab -aa -aa -aa +mo +bT +bT +bT +bT +bT +bT +bT +mo aa aa aa @@ -54210,8 +54434,8 @@ aa mo ab ab -aa -aa +ab +ab ab aa aa @@ -54465,10 +54689,10 @@ aa aa aa mo -mo +ab ab aa -ab +aa ab aa aa @@ -54724,7 +54948,7 @@ aa mo mo ab -ab +aa ab ab aa