diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index ba788239cce..8fc262a9ff9 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -276,7 +276,7 @@ playsound(target, 'sound/effects/stairs_step.ogg', 50) /obj/structure/stairs/Crossed(obj/O) - if(istype(O)) + if(istype(O) && has_gravity(get_turf(src))) O.stair_act() return ..() @@ -376,9 +376,13 @@ anchored = TRUE icon = 'icons/obj/structure/stairs.dmi' icon_state = "np_stair" + /** + * If true, this strucutre will trigger the stairs_act() proc for other structures being moved across it. + */ + var/steps = TRUE /obj/structure/platform_stairs/Crossed(obj/O) - if(istype(O)) + if(istype(O) && has_gravity(get_turf(src)) && steps) O.stair_act() return ..() @@ -400,6 +404,18 @@ /obj/structure/platform_stairs/full/south_north_cap/half icon_state = "p_stair_sn_half_cap" +/obj/structure/platform_stairs/ramp + name = "ramp" + desc = "A smooth yet archaic form of locomotion along the vertical axis." + steps = FALSE + layer = ABOVE_TILE_LAYER //They sit ontop of turfs, but below most other things + +/obj/structure/platform_stairs/ramp/north_south + icon_state = "p_ramp_sn_full_cap" + +/obj/structure/platform_stairs/ramp/east_west + icon_state = "p_ramp_ew_full_cap" + /obj/structure/platform name = "platform" desc = "An archaic method of preventing travel along the X and Y axes if you are on a lower point on the Z-axis." diff --git a/html/changelogs/verticallychallenged.yml b/html/changelogs/verticallychallenged.yml new file mode 100644 index 00000000000..b866e6e5e34 --- /dev/null +++ b/html/changelogs/verticallychallenged.yml @@ -0,0 +1,8 @@ +author: Sparky_hotdog (code), budg (sprites) + +delete-after: True + +changes: + - rscadd: "Adds non-z-level-traversing ramps, which work like stairs but they are safe to pull objects onto. Replaced some of the more frustrating stairs with ramps." + - rscadd: "Slightly remaps medical to allow their lift to reach the third deck as well." + - bugfix: "Stairs now check for gravity before having objects fall down them." diff --git a/icons/obj/structure/stairs.dmi b/icons/obj/structure/stairs.dmi index 528758a8561..f8b4c3b991a 100644 Binary files a/icons/obj/structure/stairs.dmi and b/icons/obj/structure/stairs.dmi differ diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index c08ac4da642..f670f8311f4 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -101,7 +101,7 @@ ports_of_call = TRUE map_shuttles = list( - /datum/shuttle/autodock/ferry/lift/scc_ship/morgue, + /datum/shuttle/autodock/multi/lift/morgue, /datum/shuttle/autodock/multi/lift/operations, /datum/shuttle/autodock/multi/lift/robotics, /datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod1, diff --git a/maps/sccv_horizon/code/sccv_horizon_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm index 89db8e37213..8a7b340be39 100644 --- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm +++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm @@ -74,35 +74,50 @@ lift_floor_name = "Main Deck" //Morgue Lift -/datum/shuttle/autodock/ferry/lift/scc_ship/morgue - name = "Morgue Lift" - location = 1 +/datum/shuttle/autodock/multi/lift/morgue + name = "Medical Lift" + current_location = "nav_morgue_lift_mid" shuttle_area = /area/turbolift/scc_ship/morgue_lift - waypoint_station = "nav_morgue_lift_bottom" - waypoint_offsite = "nav_morgue_lift_top" + destination_tags = list( + "nav_morgue_lift_bottom", + "nav_morgue_lift_mid", + "nav_morgue_lift_top", + ) /obj/effect/shuttle_landmark/lift name = "ABSTRACT DEF; DO NOT USE THIS" icon_state = "lift_landmark" /obj/effect/shuttle_landmark/lift/morgue_top - name = "Morgue Top" + name = "Medical - Third Deck" landmark_tag = "nav_morgue_lift_top" + base_area = /area/hallway/medical/upper + base_turf = /turf/simulated/open + +/obj/effect/shuttle_landmark/lift/morgue_mid + name = "Medical - Second Deck" + landmark_tag = "nav_morgue_lift_mid" base_area = /area/hallway/medical base_turf = /turf/simulated/open /obj/effect/shuttle_landmark/lift/morgue_bottom - name = "Morgue Bottom" + name = "Medical - First Deck" landmark_tag = "nav_morgue_lift_bottom" - landmark_flags = SLANDMARK_FLAG_AUTOSET base_area = /area/medical/morgue/lower base_turf = /turf/simulated/floor/plating /area/turbolift/scc_ship/morgue_lift - name = "Morgue Lift" + name = "Medical Lift" sound_environment = SOUND_AREA_TUNNEL_ENCLOSED ambience = AMBIENCE_GHOSTLY +/obj/machinery/computer/shuttle_control/multi/lift/medical + shuttle_tag = "Medical Lift" + +/obj/machinery/computer/shuttle_control/multi/lift/wall/medical + shuttle_tag = "Medical Lift" + layer = ABOVE_OBJ_LAYER + //Operations Lift /datum/shuttle/autodock/multi/lift/operations name = "Operations Lift" diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index b69251a9bf2..94c4d98fe6e 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -326,6 +326,9 @@ /obj/effect/landmark/latejoin, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/cryo/living_quarters_lift) +"amP" = ( +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "any" = ( /obj/structure/cable{ icon_state = "1-2" @@ -535,15 +538,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) -"awf" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/alarm/cold/east, -/turf/simulated/floor/tiled/white{ - name = "cooled white floor"; - temperature = 278.15 - }, -/area/medical/morgue/lower) "awr" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -959,15 +953,6 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) -"aMh" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "aME" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 1 @@ -1352,20 +1337,6 @@ /obj/structure/tank_wall/oxygen, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"aYY" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 10 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Emergency Supplies Storage" - }, -/obj/machinery/door/firedoor/multi_tile{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/full, -/area/medical/morgue/lower) "aZd" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -2185,7 +2156,7 @@ "bDl" = ( /obj/item/stack/rods, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "bDt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2978,6 +2949,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) +"cgP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled, +/area/maintenance/engineering) "chW" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/camera/network/engineering{ @@ -3136,6 +3111,23 @@ }, /turf/space/dynamic, /area/template_noop) +"cnR" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 9 + }, +/obj/structure/closet/crate{ + name = "Cremation Urn Materials" + }, +/obj/item/stack/material/glass/full, +/obj/item/stack/material/bronze/full, +/obj/item/stack/material/steel/full, +/obj/item/device/hand_labeler, +/obj/item/stack/material/wood/full, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "cnV" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -3263,7 +3255,7 @@ "cqu" = ( /obj/effect/spider/stickyweb, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "cqE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 @@ -3403,19 +3395,6 @@ }, /turf/simulated/floor/tiled, /area/hangar/operations) -"cuA" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "cuY" = ( /obj/machinery/light, /turf/simulated/floor/tiled/dark, @@ -4772,17 +4751,16 @@ /turf/simulated/floor/tiled/full, /area/horizon/stairwell/central) "doK" = ( -/obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/floor_decal/corner/lime{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/white{ - name = "cooled white floor"; - temperature = 278.15 - }, +/turf/simulated/floor/tiled, /area/medical/morgue/lower) "doM" = ( /obj/structure/cable/green{ @@ -5392,6 +5370,14 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) +"dKN" = ( +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "dKS" = ( /obj/effect/floor_decal/corner/brown{ dir = 5 @@ -5688,7 +5674,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/maintenance/engineering) "dXd" = ( /turf/simulated/floor/plating, /area/engineering/drone_fabrication) @@ -6349,14 +6335,13 @@ /turf/simulated/floor/wood, /area/shuttle/intrepid/quarters) "evA" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 10 +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "shutters_deck1_morgue2"; + name = "Viewing Shutter" }, -/obj/effect/landmark{ - name = "borerstart" - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "ewy" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -6657,10 +6642,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) -"eHp" = ( -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "eHq" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -7725,29 +7706,6 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) -"fmL" = ( -/obj/structure/morgue/crematorium{ - _wifi_id = "medical_crema" - }, -/obj/machinery/button/switch/crematorium{ - _wifi_id = "medical_crema"; - dir = 4; - pixel_x = 20; - pixel_y = 8; - req_access = null - }, -/obj/effect/floor_decal/corner/lime{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Autopsy and Cremation" - }, -/turf/simulated/floor/tiled/white{ - name = "cooled white floor"; - temperature = 278.15 - }, -/area/medical/morgue/lower) "fmV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8272,6 +8230,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"fIi" = ( +/obj/structure/platform_stairs/ramp/north_south{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/hangar/auxiliary) "fIp" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -10123,9 +10087,6 @@ /turf/simulated/floor/reinforced, /area/outpost/research/anomaly_harvest) "gRa" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -10136,6 +10097,10 @@ dir = 5 }, /obj/machinery/alarm/north, +/obj/machinery/power/apc/south, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -11937,7 +11902,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "ijU" = ( /obj/random/junk, /obj/effect/decal/cleanable/dirt, @@ -12401,23 +12366,6 @@ name = "thruster mount" }, /area/engineering/atmos/propulsion) -"iFL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - dir = 1; - name = "Deck 1 Medical Maintenance"; - req_access = list(5) - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "LCKDshutters"; - name = "Medical Lockdown Shutters"; - opacity = 0 - }, -/turf/simulated/floor/tiled/full, -/area/medical/morgue/lower) "iFU" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -12484,8 +12432,10 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) "iJi" = ( -/obj/structure/window/shuttle/scc_space_ship/cardinal, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, /area/outpost/research/anomaly_storage) "iJt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13022,7 +12972,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "jaP" = ( /obj/machinery/computer/general_air_control/large_tank_control/terminal{ sensors = list("starboard_prop_sensor"="Starboard Propulsion Sensor"); @@ -13369,28 +13319,29 @@ }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/port/deck1) -"joW" = ( -/obj/machinery/light/small{ - dir = 1 +"joI" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/effect/floor_decal/corner/lime{ - dir = 5 - }, -/obj/machinery/firealarm/west, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/closet/crate{ - name = "Cremation Urn Materials" - }, -/obj/item/stack/material/wood/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/bronze/full, -/obj/item/stack/material/glass/full, -/obj/item/device/hand_labeler, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 }, /area/medical/morgue/lower) +"joW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/corner/lime/full{ + dir = 8 + }, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Morgue Elevator" + }, +/turf/simulated/floor/tiled, +/area/medical/morgue/lower) "jpl" = ( /obj/structure/shuttle_part/scc/research{ icon_state = "5,4" @@ -14271,24 +14222,13 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) "jTl" = ( -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/machinery/door/airlock/medical{ - dir = 4; - name = "Cremation"; - req_one_access = list(6,33) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/structure/plasticflaps/airtight{ - dir = 8 - }, -/turf/simulated/floor/tiled/full, +/turf/simulated/floor/tiled, /area/medical/morgue/lower) "jTJ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ @@ -14408,9 +14348,6 @@ /turf/simulated/floor/plating, /area/engineering/storage/lower) "jZV" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -14927,7 +14864,7 @@ "kqO" = ( /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "kqT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15641,6 +15578,9 @@ /obj/effect/floor_decal/corner/lime{ dir = 6 }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/computer/shuttle_control/multi/lift/medical, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "kMC" = ( @@ -15883,15 +15823,6 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) -"kWx" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "kWB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -16297,6 +16228,13 @@ /obj/effect/floor_decal/corner/dark_blue/diagonal, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) +"loY" = ( +/obj/machinery/door/airlock/maintenance{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/maintenance/wing/starboard/deck1) "lpE" = ( /obj/structure/table/steel, /obj/item/storage/bag/inflatable, @@ -16703,22 +16641,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_storage) "lEQ" = ( -/obj/machinery/button/remote/blast_door{ - id = "shutters_deck1_morgue2"; - name = "Viewing Shutters"; - dir = 4; - pixel_x = 20 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/lime{ - dir = 10 - }, -/turf/simulated/floor/tiled/white{ - name = "cooled white floor"; - temperature = 278.15 - }, +/turf/simulated/wall, /area/medical/morgue/lower) "lFa" = ( /obj/machinery/hologram/holopad/long_range, @@ -17866,9 +17792,6 @@ /obj/effect/floor_decal/corner/lime/full{ dir = 1 }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Morgue Elevator" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -18947,17 +18870,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) -"mZr" = ( -/obj/effect/floor_decal/corner/lime/full{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light/small, -/obj/machinery/power/apc/east, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "mZD" = ( /obj/effect/floor_decal/corner/black{ dir = 6 @@ -19211,6 +19123,13 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) +"nhK" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "nhU" = ( /obj/effect/shuttle_landmark/horizon/exterior/deck_1/fore, /turf/template_noop, @@ -23685,23 +23604,14 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "qks" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/computer/shuttle_control/lift{ - pixel_x = -3; - pixel_y = 23; - shuttle_tag = "Morgue Lift" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck1_morgue2"; + name = "Viewing Shutters"; + dir = 4; + pixel_x = 20 }, +/obj/structure/table/steel, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "qlv" = ( @@ -23997,7 +23907,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "qvl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24197,12 +24107,17 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "qBC" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/lime{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/plasticflaps/airtight, +/obj/machinery/door/airlock/medical{ + name = "Cremation"; + req_one_access = list(6,33) }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "qBU" = ( /obj/structure/cable{ @@ -24674,18 +24589,15 @@ /turf/simulated/floor/tiled/dark, /area/outpost/mining_main/eva) "qVO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/corner/lime{ dir = 5 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/tiled{ name = "cooled floor"; temperature = 278 @@ -25264,16 +25176,16 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "rpa" = ( -/obj/structure/platform_stairs/full/east_west_cap{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, /obj/structure/railing/mapped, /obj/effect/floor_decal/corner/lime{ dir = 5 }, +/obj/structure/platform_stairs/ramp/east_west{ + dir = 4 + }, +/obj/structure/platform{ + dir = 1 + }, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -25390,6 +25302,19 @@ }, /turf/simulated/floor/tiled/full, /area/storage/eva) +"rsi" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 6 + }, +/obj/machinery/alarm/cold/south, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "rsk" = ( /obj/structure/cable{ icon_state = "2-8" @@ -25705,9 +25630,6 @@ /turf/simulated/floor/tiled/dark, /area/hangar/control) "rFO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/corner/lime{ dir = 5 }, @@ -25716,11 +25638,11 @@ name = "Viewing Shutters"; pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -26111,7 +26033,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "rTG" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -26283,6 +26205,14 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"rZC" = ( +/obj/machinery/door/firedoor, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/wing/starboard/deck1) "sad" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -26484,7 +26414,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/stack/tile/floor, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/maintenance/engineering) "skq" = ( /obj/effect/floor_decal/corner/lime/full{ dir = 8 @@ -27377,16 +27307,16 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "sRe" = ( -/obj/structure/platform_stairs/full/east_west_cap, -/obj/structure/platform{ - dir = 1 - }, /obj/structure/railing/mapped, /obj/effect/floor_decal/corner/lime{ dir = 5 }, +/obj/structure/platform_stairs/ramp/east_west, +/obj/structure/platform{ + dir = 1 + }, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -28268,7 +28198,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "txa" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28635,7 +28565,7 @@ /obj/effect/decal/cleanable/dirt, /obj/random/junk, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/maintenance/engineering) "tJq" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/effect/floor_decal/industrial/warning{ @@ -29634,7 +29564,7 @@ "uqE" = ( /obj/structure/trash_pile, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "urr" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -30912,11 +30842,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"vif" = ( -/obj/machinery/light/small, -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "vik" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -30970,7 +30895,7 @@ /obj/random/junk, /obj/machinery/alarm/north, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "vjM" = ( /obj/effect/floor_decal/corner/yellow{ dir = 6 @@ -31015,6 +30940,26 @@ /obj/effect/floor_decal/corner/dark_blue, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"vkj" = ( +/obj/structure/morgue/crematorium{ + _wifi_id = "medical_crema"; + dir = 4 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/button/switch/crematorium{ + _wifi_id = "medical_crema"; + pixel_x = 8; + pixel_y = -20; + req_access = null + }, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "vkm" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -31708,6 +31653,9 @@ /obj/item/device/flashlight/lamp, /turf/simulated/floor/reinforced, /area/rnd/isolation_a) +"vLE" = ( +/turf/simulated/floor/plating, +/area/maintenance/engineering) "vLJ" = ( /obj/structure/railing/mapped{ dir = 8 @@ -32302,7 +32250,7 @@ icon_state = "medium" }, /turf/simulated/floor/tiled, -/area/maintenance/operations) +/area/maintenance/engineering) "wjH" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 @@ -32562,7 +32510,7 @@ "wqj" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "wqr" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -32645,16 +32593,15 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "wsT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/corner/lime{ - dir = 10 + dir = 9 }, -/turf/simulated/floor/tiled/white{ - name = "cooled white floor"; - temperature = 278.15 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, +/turf/simulated/floor/tiled, /area/medical/morgue/lower) "wtl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32960,6 +32907,19 @@ }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/hangar/starboard) +"wHO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lime{ + dir = 6 + }, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, +/area/medical/morgue/lower) "wHX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -33252,6 +33212,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/research_sublevel) +"wRA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/black{ + dir = 10 + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/hangar/auxiliary) "wRE" = ( /turf/simulated/wall, /area/storage/eva) @@ -33625,13 +33602,10 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) "xej" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/machinery/light/small, -/obj/effect/floor_decal/corner/lime/full, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/table/steel, +/obj/machinery/camera/network/medbay{ + c_tag = "Medical - Autopsy and Cremation" }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -33697,10 +33671,8 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/light/small, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "xgP" = ( @@ -33894,6 +33866,10 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) +"xkE" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "xkJ" = ( /obj/effect/decal/cleanable/cobweb2{ icon_state = "cobweb1" @@ -34522,7 +34498,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/operations) +/area/maintenance/engineering) "xCn" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -34541,6 +34517,14 @@ dir = 5 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_medical{ + dir = 4; + name = "Emergency Supplies Storage" + }, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "xCT" = ( @@ -34862,15 +34846,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/isolation_a) -"xNb" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/morgue/lower) "xNw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -35016,7 +34991,9 @@ /turf/simulated/floor/tiled, /area/rnd/eva) "xRv" = ( -/obj/structure/platform_stairs/full, +/obj/structure/platform_stairs/ramp/north_south{ + dir = 8 + }, /turf/simulated/floor/plating, /area/hangar/auxiliary) "xRF" = ( @@ -35295,13 +35272,11 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "yau" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/obj/machinery/door/blast/shutters{ - dir = 4; - id = "shutters_deck1_morgue2"; - name = "Viewing Shutter" +/obj/effect/landmark{ + name = "borerstart" }, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled, /area/medical/morgue/lower) "yaP" = ( /obj/structure/cable/green{ @@ -35559,38 +35534,6 @@ }, /turf/simulated/floor/tiled/full, /area/storage/eva) -"yml" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/dark, -/area/hangar/auxiliary) -"ymm" = ( -/obj/machinery/door/firedoor, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/door/airlock/maintenance_hatch{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/wing/starboard/deck1) -"ymn" = ( -/obj/machinery/door/airlock/maintenance{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/maintenance/wing/starboard/deck1) (1,1,1) = {" eSV @@ -45833,7 +45776,7 @@ eSV eSV hTk wVV -ymn +loY wVV wVV dLh @@ -48470,7 +48413,7 @@ eSV eSV eSV hTk -ymm +rZC wVV wVV dod @@ -48886,7 +48829,7 @@ lIg lIg lIg xCD -aYY +lIg qkh qkh qkh @@ -49089,9 +49032,9 @@ ege pPU lIg gRa -qBC -fDD -fDD +lIg +cnR +vkj lIg ueg vqU @@ -49293,8 +49236,8 @@ rQp qZW jZV evA -gMp -fDD +joI +dKN lIg rPA vqU @@ -49496,10 +49439,10 @@ mst qZW qVO qBC -fDD -fDD +wHO +rsi lIg -vqU +tkX fCT niw gvZ @@ -49698,7 +49641,7 @@ sRe qEk lIg rFO -cuA +lIg qks xej lIg @@ -49901,11 +49844,11 @@ wYE xll iDM xgE -kWx -xNb -aMh -iFL -vqU +lIg +lIg +lIg +lIg +lIg jUl tZY jpT @@ -50106,9 +50049,9 @@ lIg mon pnZ kLR -mZr +fDD +fDD lIg -rPA oDv avx wPz @@ -50306,12 +50249,12 @@ hQO skq caN lIg -lIg +amP jTl yau +gMp +fDD lIg -lIg -vqU oDv tIS wkD @@ -50512,9 +50455,9 @@ lIg joW doK wsT -vif +fDD +fDD lIg -vqU oDv tIS wkD @@ -50712,12 +50655,12 @@ grm wOP rUU lIg -fmL -awf -lEQ -eHp lIg -tkX +lIg +lEQ +lIg +lIg +lIg ohS rRb wkD @@ -50915,12 +50858,12 @@ lIg lIg lIg lIg -lIg -lIg -lIg -lIg -lIg -vqU +vLE +cgP +cgP +vLE +jsV +xkE oDv tIS wkD @@ -51121,9 +51064,9 @@ icm twX wqj tJg -fCT -nnw -vqU +vLE +jsV +xkE oDv tIS wkD @@ -51325,8 +51268,8 @@ vjI sko wjr rTF -nnw -rPA +jsV +nhK oDv xEd pWZ @@ -51529,7 +51472,7 @@ ijn dWL bDl sRd -vqU +xkE teA tYS bKP @@ -51933,7 +51876,7 @@ icm cqu kqO jaN -fCT +vLE oOk hPn ych @@ -52133,10 +52076,10 @@ khO icm icm icm -nnw -nnw +jsV +jsV quA -nnw +jsV oOk jrr lyU @@ -53933,7 +53876,7 @@ pQv ybl cqE tGU -gVx +loY trc oWg fZr @@ -62298,7 +62241,7 @@ xtK xtK xtK xXt -yml +wRA pPV pPV pPV @@ -62705,7 +62648,7 @@ fIp xtK rrR ows -xRv +fIi bJa bJa bJa diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 354cb30b7da..0e6da835453 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -376,6 +376,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ors) +"ail" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "ais" = ( /obj/machinery/door/airlock/maintenance{ dir = 4; @@ -2144,13 +2162,9 @@ /turf/simulated/floor/plating, /area/engineering/rust_office) "aUz" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/corner_wide/green{ dir = 10 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_y = 2 - }, /obj/structure/railing/mapped, /turf/simulated/floor/tiled/white, /area/hallway/medical) @@ -3075,10 +3089,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/platform_stairs/full/east_west_cap{ - dir = 8 +/obj/structure/platform_stairs/ramp/east_west{ + dir = 4 }, -/obj/structure/platform/cutout, +/obj/structure/platform/ledge, /turf/simulated/floor/tiled, /area/hallway/engineering) "bpa" = ( @@ -4294,6 +4308,9 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 8 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "bPd" = ( @@ -4526,6 +4543,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/horizon/security/equipment) +"bSw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/shuttle_landmark/lift/morgue_mid, +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/morgue_lift) "bSD" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -5521,22 +5545,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "csx" = ( -/obj/machinery/vending/medical{ - density = 0; - pixel_x = -1; - pixel_y = 32 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 1 - }, -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) +/obj/machinery/computer/shuttle_control/multi/lift/medical, +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/morgue_lift) "csL" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -5835,6 +5849,13 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) +"cDg" = ( +/obj/structure/railing/mapped, +/obj/structure/bed/stool/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "cDx" = ( /obj/machinery/appliance/cooker/stove, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6475,19 +6496,13 @@ /turf/simulated/floor/wood, /area/horizon/library) "cSs" = ( -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/computer/shuttle_control/lift/wall{ - dir = 4; - pixel_x = -32; - shuttle_tag = "Morgue Lift" - }, -/obj/structure/railing/mapped{ - dir = 1 +/obj/structure/table/standard, +/obj/item/material/stool/chair/wheelchair, +/obj/item/material/stool/chair/wheelchair, +/obj/item/material/stool/chair/wheelchair, +/obj/item/material/stool/chair/wheelchair, +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 }, /turf/simulated/floor/tiled/white, /area/hallway/medical) @@ -6867,11 +6882,13 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/kitchen/freezer) "def" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 +/obj/structure/table/standard, +/obj/item/storage/box/bodybags{ + pixel_x = 4; + pixel_y = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/item/storage/box/bodybags{ + pixel_y = -1 }, /turf/simulated/floor/tiled/white, /area/hallway/medical) @@ -12141,13 +12158,6 @@ }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) -"fCI" = ( -/obj/structure/bed/stool/chair/office/dark, -/obj/effect/floor_decal/corner_wide/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) "fCS" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -14738,8 +14748,12 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/structure/platform_stairs{ - dir = 1 +/obj/structure/platform_stairs/ramp/north_south{ + dir = 1; + pixel_x = 16 + }, +/obj/structure/platform_stairs/ramp/north_south{ + pixel_x = -16 }, /turf/simulated/floor/tiled/white, /area/rnd/lab) @@ -16051,11 +16065,12 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "hlu" = ( -/obj/machinery/papershredder, /obj/structure/railing/mapped{ - dir = 4 + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/railing/mapped, /turf/simulated/floor/tiled/white, /area/hallway/medical) "hlK" = ( @@ -16340,6 +16355,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "hrC" = ( @@ -17140,7 +17158,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway/secondary) "hIq" = ( -/obj/structure/platform_stairs/full/east_west_cap, +/obj/structure/platform_stairs/ramp/east_west, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "hIz" = ( @@ -18177,13 +18195,13 @@ /turf/simulated/floor/tiled/dark, /area/operations/office) "ikB" = ( -/obj/structure/platform_stairs/full/east_west_cap{ - dir = 8 +/obj/structure/platform_stairs/ramp/east_west{ + dir = 4 }, -/obj/structure/platform/cutout, /obj/structure/platform{ dir = 1 }, +/obj/structure/platform/ledge, /turf/simulated/floor/tiled, /area/operations/lower/machinist/surgicalbay) "ikT" = ( @@ -19358,6 +19376,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/vending/medical{ + density = 0; + pixel_x = -1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "iMf" = ( @@ -19449,6 +19472,12 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "iOg" = ( @@ -20410,6 +20439,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "jmj" = ( @@ -20436,6 +20471,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "jmF" = ( @@ -21180,13 +21221,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "jDU" = ( -/obj/structure/platform, -/obj/structure/filingcabinet/filingcabinet{ - pixel_x = -7 - }, /obj/machinery/papershredder{ pixel_x = 7 }, +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = -7 + }, +/obj/structure/platform, /turf/simulated/floor/tiled/dark, /area/rnd/lab) "jDZ" = ( @@ -22677,13 +22718,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) -"kqi" = ( -/obj/structure/table/standard, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) "kqz" = ( /obj/machinery/alarm/west, /obj/machinery/light{ @@ -23768,19 +23802,8 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "kUc" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/corner_wide/green/full, /obj/machinery/alarm/west, -/obj/item/storage/box/masks, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 - }, /obj/structure/railing/mapped, /obj/structure/stairs_lower/stairs_upper{ layer = 3.1 @@ -27930,7 +27953,7 @@ /turf/simulated/floor/wood, /area/horizon/bar) "mOH" = ( -/obj/structure/platform_stairs/full/east_west_cap{ +/obj/structure/platform_stairs/ramp/east_west{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -30831,20 +30854,9 @@ /obj/machinery/camera/network/medbay{ c_tag = "Medical - Hallway 2" }, -/obj/structure/railing/mapped{ - dir = 8 +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 }, -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/table/standard, -/obj/item/material/stool/chair/wheelchair, -/obj/item/material/stool/chair/wheelchair, -/obj/item/material/stool/chair/wheelchair, -/obj/item/material/stool/chair/wheelchair, /turf/simulated/floor/tiled/white, /area/hallway/medical) "oil" = ( @@ -31532,6 +31544,10 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/white, /area/operations/break_room) +"oyA" = ( +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "oyP" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/alarm/east, @@ -33198,6 +33214,16 @@ }, /turf/simulated/floor/tiled, /area/operations/lobby) +"plX" = ( +/obj/item/modular_computer/console/preset/medical{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 9 + }, +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "pmm" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -34009,15 +34035,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/aux_atmospherics/deck_2/starboard) -"pKh" = ( -/obj/effect/floor_decal/corner_wide/green{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) "pKy" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 @@ -34995,6 +35012,18 @@ dir = 4 }, /obj/structure/disposalpipe/junction/yjunction, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/machinery/computer/shuttle_control/multi/lift/wall/medical{ + pixel_y = 14 + }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "qhA" = ( @@ -39925,10 +39954,7 @@ /turf/simulated/floor/wood, /area/rnd/hallway) "syj" = ( -/obj/structure/platform/cutout{ - dir = 8 - }, -/obj/structure/platform_stairs/full/east_west_cap, +/obj/structure/platform_stairs/ramp/east_west, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "sym" = ( @@ -41231,10 +41257,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/platform_stairs/full/east_west_cap, -/obj/structure/platform/cutout{ - dir = 8 - }, +/obj/structure/platform_stairs/ramp/east_west, +/obj/structure/platform/ledge, /turf/simulated/floor/tiled, /area/hallway/engineering) "thL" = ( @@ -41941,10 +41965,17 @@ /turf/simulated/floor/plating, /area/hallway/engineering) "tAM" = ( -/obj/structure/platform_stairs, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/structure/platform_stairs/ramp/north_south{ + dir = 8; + pixel_x = 16 + }, +/obj/structure/platform_stairs/ramp/north_south{ + dir = 4; + pixel_x = -16 + }, /turf/simulated/floor/tiled/dark, /area/rnd/lab) "tAN" = ( @@ -42143,26 +42174,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/port/far) -"tFy" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/table/standard, -/obj/item/storage/box/bodybags{ - pixel_y = -1 - }, -/obj/item/storage/box/bodybags{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) "tFA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -42243,18 +42254,6 @@ }, /turf/simulated/floor/tiled/full, /area/operations/qm) -"tGb" = ( -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) "tGP" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -42300,6 +42299,17 @@ }, /obj/machinery/firealarm/north, /obj/effect/floor_decal/sign/srg, +/obj/structure/table/standard, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/masks, +/obj/item/storage/box/masks, /turf/simulated/floor/tiled/white, /area/hallway/medical) "tHt" = ( @@ -44119,7 +44129,6 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "utF" = ( -/obj/structure/platform_stairs, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -44128,6 +44137,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/platform_stairs/ramp/north_south{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "uuI" = ( @@ -44436,9 +44448,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/zat) "uDs" = ( -/obj/structure/platform, /obj/structure/closet/crate, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/platform, /turf/simulated/floor/tiled/dark, /area/rnd/lab) "uDO" = ( @@ -44733,15 +44745,15 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "uKB" = ( -/obj/structure/platform_stairs/full{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/platform_stairs/ramp/east_west{ + dir = 1 }, /obj/structure/platform{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "uKJ" = ( @@ -47487,6 +47499,19 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_hard) +"vYl" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 + }, +/obj/machinery/papershredder, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "vYv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -50381,26 +50406,30 @@ /turf/simulated/floor/grass, /area/horizon/hallway/deck_two/fore) "xlQ" = ( -/obj/item/modular_computer/console/preset/medical{ +/obj/structure/railing/mapped{ dir = 8 }, /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, -/obj/structure/railing/mapped{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner{ + pixel_y = 2 }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "xlV" = ( /obj/machinery/door/firedoor, -/obj/structure/platform_stairs/full{ - dir = 4 +/obj/machinery/light, +/obj/structure/platform_stairs/ramp/east_west{ + dir = 8 }, /obj/structure/platform{ dir = 1 }, -/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "xmt" = ( @@ -50686,12 +50715,6 @@ /obj/random/loot, /turf/simulated/floor/plating, /area/maintenance/research_port) -"xva" = ( -/obj/machinery/recharger, -/obj/structure/table/standard, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) "xvC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -50733,10 +50756,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/platform_stairs/full/east_west_cap{ - dir = 8 +/obj/structure/platform_stairs/ramp/east_west{ + dir = 4 }, -/obj/structure/platform/cutout, +/obj/structure/platform/ledge, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "xxa" = ( @@ -51454,15 +51477,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_b) "xNn" = ( -/obj/machinery/computer/shuttle_control/lift{ - pixel_y = -1; - shuttle_tag = "Morgue Lift" +/obj/structure/table/standard, +/obj/machinery/recharger, +/obj/effect/floor_decal/corner_wide/green/full{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/morgue_lift) +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "xNu" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-4" @@ -52680,12 +52701,14 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "ykA" = ( -/obj/effect/shuttle_landmark/lift/morgue_top, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 }, -/turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/morgue_lift) +/turf/simulated/floor/tiled/white, +/area/hallway/medical) "ylh" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -66165,7 +66188,7 @@ dtr mqR dKR xNn -oza +plX cSs rCf nQm @@ -66367,7 +66390,7 @@ rFR wuJ gnD ykA -vKH +cDg def xLG nQm @@ -66568,9 +66591,9 @@ scG weY jqw dKR -ifK -cxu -tGb +vYl +oyA +xur iLT noR xKU @@ -66771,8 +66794,8 @@ rTP tat dKR oif -tFy -pKh +xur +xur leU nQm nQm @@ -67176,7 +67199,7 @@ dKR dKR nIi csx -xur +oza jmE aUz xur @@ -67377,8 +67400,8 @@ vQV hAu vBn wXA -jWj -xva +bSw +vKH hrf gPG tcQ @@ -67579,8 +67602,8 @@ bRm paL rTR wXA -fCI -kqi +ifK +cxu qhz qwJ mIO @@ -67783,7 +67806,7 @@ eMp wXA xlQ hlu -hHE +ail dht ovY nTp diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 4f4054f3eeb..7de0eed9b0c 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -55,6 +55,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) +"acn" = ( +/obj/structure/platform/ledge{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "acp" = ( /obj/structure/railing/mapped{ dir = 8 @@ -1254,6 +1263,16 @@ /obj/effect/floor_decal/industrial/outline/emergency_closet, /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) +"aSL" = ( +/obj/structure/lattice, +/obj/structure/platform/ledge{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "aTd" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -2306,8 +2325,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_blue/full, -/obj/structure/platform_stairs/full{ - dir = 1 +/obj/structure/platform_stairs/ramp/north_south{ + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge) @@ -3037,7 +3056,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/railing/mapped, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "ciK" = ( @@ -4212,6 +4230,10 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) +"dlt" = ( +/obj/effect/shuttle_landmark/lift/morgue_top, +/turf/simulated/open, +/area/hallway/medical/upper) "dlM" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -5044,6 +5066,23 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"dSy" = ( +/obj/structure/platform/ledge, +/obj/structure/platform/ledge{ + dir = 8 + }, +/obj/structure/platform/ledge{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/obj/structure/platform_deco/ledge{ + dir = 6 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "dSB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7256,6 +7295,13 @@ "fmB" = ( /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) +"fmC" = ( +/obj/structure/platform/ledge, +/obj/structure/platform_deco/ledge{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "fmL" = ( /obj/machinery/door/airlock/maintenance{ dir = 4; @@ -8578,6 +8624,9 @@ /obj/structure/platform/ledge{ dir = 4 }, +/obj/structure/platform_deco/ledge{ + dir = 8 + }, /turf/simulated/open, /area/hallway/medical/upper) "gcV" = ( @@ -8863,8 +8912,8 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, -/obj/structure/platform_stairs/full{ - dir = 1 +/obj/structure/platform_stairs/ramp/north_south{ + dir = 8 }, /turf/simulated/floor/tiled, /area/bridge) @@ -11452,15 +11501,15 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/structure/platform_stairs/full{ +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/obj/structure/platform_stairs/ramp/east_west{ dir = 4 }, -/obj/structure/platform/cutout, /obj/structure/platform{ dir = 1 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor, +/obj/structure/platform/ledge, /turf/simulated/floor/tiled, /area/bridge/upperdeck) "hRV" = ( @@ -14585,6 +14634,15 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/crew_quarters/fitness/showers) +"jZH" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/computer/shuttle_control/multi/lift/wall/medical{ + dir = 4; + pixel_x = -20; + pixel_y = 10 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "jZN" = ( /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) @@ -20810,6 +20868,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/lawoffice/consular) +"oaH" = ( +/obj/structure/platform_deco/ledge{ + dir = 4 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "oaY" = ( /obj/structure/lattice, /obj/structure/railing/mapped{ @@ -23134,6 +23198,23 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) +"pDi" = ( +/obj/structure/platform/ledge, +/obj/structure/platform/ledge{ + dir = 4 + }, +/obj/structure/platform/ledge{ + dir = 1 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, +/obj/structure/platform_deco/ledge{ + dir = 10 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "pEk" = ( /obj/machinery/porta_turret, /obj/effect/floor_decal/industrial/warning/full, @@ -26032,6 +26113,14 @@ }, /turf/simulated/floor, /area/maintenance/substation/command) +"rIM" = ( +/obj/structure/lattice, +/obj/structure/platform/ledge, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "rIP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -26225,6 +26314,18 @@ /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port/docks) +"rPp" = ( +/obj/structure/platform/ledge{ + dir = 4 + }, +/obj/structure/platform/ledge{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "rPy" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -27806,6 +27907,7 @@ /obj/structure/platform_deco/ledge{ dir = 5 }, +/obj/structure/platform_deco/ledge, /turf/simulated/open, /area/hallway/medical/upper) "sMq" = ( @@ -29567,6 +29669,13 @@ }, /turf/simulated/floor, /area/crew_quarters/heads/hop/xo) +"tZg" = ( +/obj/structure/platform/ledge, +/obj/structure/railing/mapped{ + dir = 1 + }, +/turf/simulated/open, +/area/hallway/medical/upper) "tZE" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -34872,6 +34981,12 @@ /obj/structure/platform/ledge{ dir = 4 }, +/obj/structure/platform/ledge{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, /turf/simulated/open, /area/hallway/medical/upper) "xHH" = ( @@ -49731,7 +49846,7 @@ ewp xsy gUY sMd -gcR +rPp xHj gcR uJm @@ -49932,10 +50047,10 @@ oZE vLY pOM jRh -umT +dSy dVW -nHR dVW +tZg rle iCT uGa @@ -50134,10 +50249,10 @@ vKa fTH wtd cin -gPn -nHR -nHR -nHR +jZH +dlt +dVW +rIM fFg dSw iBF @@ -50336,10 +50451,10 @@ hLw vLY aaF nXf -umT +pDi dVW -nHR dVW +tZg rle qMs wLL @@ -50538,10 +50653,10 @@ vLY vLY daa iiQ -umT -dVW -nHR -dVW +fmC +acn +aSL +oaH rle iYu xVe