From 77b96fa24bf1acaeaa19a9024a9151e21200c1cb Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 10 Jun 2024 19:56:49 +0200 Subject: [PATCH] Revert "Overcoming Verticality - Adds ramps, extends the medical lift and fixes stair gravity." (#19411) - The sprites are unsatisfactory and don't fit the environment. Additionally, single-tile sprites are missing, and some areas have an amalgamation of stairs and ramps - with ramps looking far worse than stairs in general. Cute experiment, but I don't think it's worth it. - The medical lift remap looks extremely awkward on live. --- code/modules/multiz/structures.dm | 20 +- html/changelogs/verticallychallenged.yml | 8 - icons/obj/structure/stairs.dmi | Bin 3058 -> 1875 bytes maps/sccv_horizon/code/sccv_horizon.dm | 2 +- maps/sccv_horizon/code/sccv_horizon_lifts.dm | 33 +- maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 647 ++++++++++--------- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 401 ++++++------ maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 159 +---- 8 files changed, 575 insertions(+), 695 deletions(-) delete mode 100644 html/changelogs/verticallychallenged.yml diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 8fc262a9ff9..ba788239cce 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) && has_gravity(get_turf(src))) + if(istype(O)) O.stair_act() return ..() @@ -376,13 +376,9 @@ 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) && has_gravity(get_turf(src)) && steps) + if(istype(O)) O.stair_act() return ..() @@ -404,18 +400,6 @@ /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 deleted file mode 100644 index b866e6e5e34..00000000000 --- a/html/changelogs/verticallychallenged.yml +++ /dev/null @@ -1,8 +0,0 @@ -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 f8b4c3b991aadd5467153d23b2fa31aa03c6efb1..528758a8561f8459097a9be2c51c6df233e1eb4b 100644 GIT binary patch literal 1875 zcmai#X;{*G7RO1&9!bSLG!xAgK@G{mn}J+Z#Fguc%H)!^+}uJ7Gqt(@W^k!c%QU_2 zm1bftce+{{>J=|)DyB18Nmm72GWR7Hs0O_=^LAdG-}iIQ_dMr3&w2C9qY_9gmw`GOp$-=38vkCXkViB3@oXXqE=6EDQYfz>St@=M z2|bW*{hr`P6?I6(oN&Y~fv%QiwT%3nK(w&q)*pMOADx&&kJ$G*cHdmDYd_i8-}_RU z7ml2qwdTq=M1l6k%Fh{zk4J$6@dx8Qqrnt(U$B)@JlLQC>n?xaa8NR z<|xQ@6x<#Y{LrmS6BUO{p0w1lKjXa7&i`(JxiYr>_Sp$_t?bArXKC$`*V9T1O#?%p z08T*x&32isO;2l2CJSB!&i>#?BhZ>-h}pGul1*=i`BwvumG#Go+nEOVCl%(rdYvOd z4awz8n=jZ|oE2WdiPVvptl`6O7XDQ?Fvb`euOIUyWUDJ?kq>Ts|#MV+O`_nK79TotwI3wI$IO)eYp8@h|E>&`p*N zlIt3tv13&kUO>l5!SHPkhS_N4n*WUt);(^4{n=;%{RLdeNyz>+7h81{B?W)HmV{s*PM_N3FOBAP9+ZDPy%Sw8S}Ay%Jfn0(*ggRr?@LM8B8c~Zr*+P*`Fqu60Q zwu{OyZnwfTkv#(jJ*V6#BG>K9&TpGv6zKJ#_p(cCqS>hbFd4`@!!Ga1UA?P-;GHLA z8c#J(g0J}8V=Dd-=Bx>WR`DgzOnIa5P>fb?)H-b4p^+<&-#0E)DL7FScPvaf-XR2Ow0Pen>-IsZ!8k2zI(qxHy-_BEv; zs&;r1rQ{G>iXznbF9X52!iq%6&e(XL=rC($vcx7|^SUJDs(?2c04z!}rW7Q8h-?Wq z>2%JF0dajLYU&)?$!kwPJnG5BaoAFg&hpfbpc}7jG{jdxb<${Nsb)SLi62cj_oAk; z9d?E?%(j@db~X_PsZ7ZqKS3Mg8mFE6jfsLyRanG$#K6t_yw>$b{|8E+F?Cnf*DNxI z^)SL@08o|zId9OVoRLI@7lA(NZ6K|WUtl)ZT$8yrA1cl#p#E!%J(n<=7rtY z-q~j^847J+ep|aITeizX336#S?sKxOJfUqA!3oXsw(#9W7k<$7@rosO z*h`Jv2Q!a3UDVXAr2`xXc$1xb#sePCeLK)P6UV(Na&2o)nJqdH)Bybi|0nO1>X%2| zLmQN)@=r}UM(bEp$RAWjji%IkDl`<%k+*y9Ucq~=1Pcbth-$}lg8?0)mQ(@@#{C0U z3H4;wLIdGXakNxyCJM*3Q+?yWn9$pQvGgR2Ibz2@-12*8(G2Te_?6E87w#CTO3c|C VR_xk(U)hfbB0GCIJ^elm_&0=fhVK9X literal 3058 zcmYM0dpy(a8^A0G`34FdxMCX=~y=gz38C>o8HnVFfJo2#Ip zfWcrC6&0~qYoBB+dUagDS%7vUZ59~$W&5)6Sv=VjfhM83c)So*FYdgorVs3|G_dblyPqL-<) zI*PQmR?n1l`~BHktHBu2%&uaHTT&eNbEP@X@jXq-V0H=98IZa?=__=1+dG@r!zk4h ztk=0g$SEPB$VteK#z=PUtsmP>yZYTdT|!j0Y9(u%`>v2C1_^>e!Yxcu2*zGSNt^1w*P=6>08rdFpi&xL8W>F*qO z%{)34t=Z{Yx;rjhK7pjL4|mQIx0P8Xoc2+u3b1mz&8R>1Guhh`SMKd$YKoQp*=FYh zXr{==ksT}(q!f;Q!^tL7i7c%?j+S&w(Sjg6jx?t_Z4`vuaq&TiBw{K@h2222D0QPL zY1dL)D+fW5L8}0-V?9+#IE;_Fg!3Zly$uV~3?!trLWR7O@1&7TV^?1G$>q_9M(S^= zW~9}zy^mo`pjW^YS{kWH8ZLJZBAD(AOnSfJWobuH;%;%;rt&j(Wz~r1x zq$<4nyKxRKbkHCb$|T4rE{Xm{J;REpQP-=Ydx!Pv$}L@$=LO;jr=QyOoSu( z=@=+>(TSDEZAQ(j!LF8j^+P&8o)Uf3!1|7kjOHQPYYN5fX*WnfXMQ^HKqzrFX?VX! z^F|%_NfT&pmI`2x6Oj7VXlXw!YYO@sPBP6Eco^FRdJ}JmW6cnlX?phk7uaHX4UK)` zYHQ=DrHBfV`skfFEJmgk$**2M1Tv7EIj)RnDRr#Ki%qp47XKJ_Mmo<~jyHu}xdzSO z-Vc>r_F5Q;W`v^M_2J9R1$>t5=tMvN1I6O~%19q@D67%x5XRn9qFc9)`D3`8S|5wj?tW!Up5Le9EEMR;-hY(p3s@i;*Z09X1o(jl z^Ib#nZv=QhI`>wY&Gs?j>=GJY>y>c<7OCH~4!*vy?rd0jLRV>ot@bYyPtPv4#(4?N z+sk;`8rwKD?ogu(djB$ObO>s8su3(x6X!?QIMdc{@Yh(NCaB z9P65F34U#kjCP-8JJ*8L^(qKt5S-_ZK`&JO1+5erIyZhlwX?IOoATQS^Oc~>1pd|oHmhG9$X-P`z&K>dj_1zM7E1=6boq@RaeREo zetPX78j&-jntQW`Y$?sJXDh=0N3L}RS_<0zmbxlWu9gv)Qi?#%$ge^NcqL(A!O>>6 z66_%`g*j4~=`V0=E?ZF&Gy6*iD+%dfdTiN0stsnE8MVt7ni_hrgBvMovKVY4B-Kp7 zk~nY=SG#S}mkxFuQ4w{z@*+Uhlbup_lXOqM>|2kr2`gF4{bU<2$YIz8COc-@1{*4p%}OLgFuE&-|pt03b;n!ovZr$;a zL}}^KxhdU0%AqmMPHLWh!dJLRcQYQ&UzoT+7i`a+vwq{dNjBexnJ1R8joZEXLl<&@ zo`D;YTd1s~NM_XYN~*a>TCnHH<}Qt!Ry_#F4@N=>ulwZJ+K+)A4hL>RGJH^|hYzin zWzUlPUeZS8M%8a=?^PT!nJm-OkhJICZk%k_3fgb4OG6kKHhHI@QD_sTkn1*wa6)`IjP4f zCO$qhe>CwE4y9`wvpEB*2E^pHE0 z)F@cX_s)d970?;6gTc?WNsCQDTeSfY%i&EjRI!c;r%is^Y6rhDjSy&V>{ggRct)!* z%p6(Yy9a8o9sJ5PdyWNp0o~D<hW$uUhk~4y+^BT&?Zi?R0XLsqd8AP9>lAXQUBnVU9@-5KJt9m&q<0kD zJ^w|_LhLv$NRekyW|X;2Uz_M=sV<&rSPCg9Y2QZz15h!cAnUkzba01ypaf$-$=C{x z>jSf|FThAyXk|@0M=V=zJ}jRjCP51E04@V(f&R+JuA;9r#{aY~LvJ0~G) z>yU958BLP;Iy>CpzMOr{0GkTI2CsY5c>)%U#AW$lX64JJJ{Ay$5>roMEx_y#`zloo zxqHPSi!5HNUtss}Nh%Hcb8#K_L>~?*L?0P<=-n}h=fV6c_FFAh#b+jhQu-f>g{!82 zZiG!n-j$<|#+=oyI`R${2=|N!^cbr;rf4`{hiI2?Dw-+!dhB_Lu+`KH9^WOfK|ke1 zqBvh?it{0gR+J*1=h+9IT-3I=yab%$Y$Ih?x^zKeEJsqV%^)8~`h!}j_u^@5H`9Mn z8`ywZ?A4d=$N5aEfv_SmA8$Dz0{WgyrHt%JyVYPu2^!hDOJYF#?cctvg-p#B7FRa_ zBOCXVY&1H%8Hk~|5a`E+p1&du`zG{8-5>=kzPmIGx%rP_6)H#Q*~M49fI*8H&}ihf zH!x_3&lPZw;B)M`CisThB`DbO{xpvwhOc^bKWcDb90r-pubK-FFoDoQMv>L9icYkI z>qUMGdY#Y0g&Kh+HZ66n+6LRo4@N72>&zPxGagx~%{+!pl@i3~{YHK8VVTmy{qkSy zprrGGb`3%IAf1F*XI&-8*kN=G$utN;8^&qO%knQzjtx+viR!6U!cE!8@2Fm|T;@LOZ&6|9dF9`vHL)xJ diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index f670f8311f4..c08ac4da642 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/multi/lift/morgue, + /datum/shuttle/autodock/ferry/lift/scc_ship/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 8a7b340be39..89db8e37213 100644 --- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm +++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm @@ -74,50 +74,35 @@ lift_floor_name = "Main Deck" //Morgue Lift -/datum/shuttle/autodock/multi/lift/morgue - name = "Medical Lift" - current_location = "nav_morgue_lift_mid" +/datum/shuttle/autodock/ferry/lift/scc_ship/morgue + name = "Morgue Lift" + location = 1 shuttle_area = /area/turbolift/scc_ship/morgue_lift - destination_tags = list( - "nav_morgue_lift_bottom", - "nav_morgue_lift_mid", - "nav_morgue_lift_top", - ) + waypoint_station = "nav_morgue_lift_bottom" + waypoint_offsite = "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 = "Medical - Third Deck" + name = "Morgue Top" 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 = "Medical - First Deck" + name = "Morgue Bottom" 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 = "Medical Lift" + name = "Morgue 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 94c4d98fe6e..b69251a9bf2 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -326,9 +326,6 @@ /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" @@ -538,6 +535,15 @@ /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" @@ -953,6 +959,15 @@ /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 @@ -1337,6 +1352,20 @@ /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 @@ -2156,7 +2185,7 @@ "bDl" = ( /obj/item/stack/rods, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "bDt" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2949,10 +2978,6 @@ }, /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{ @@ -3111,23 +3136,6 @@ }, /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" @@ -3255,7 +3263,7 @@ "cqu" = ( /obj/effect/spider/stickyweb, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "cqE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 @@ -3395,6 +3403,19 @@ }, /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, @@ -4751,16 +4772,17 @@ /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, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, /area/medical/morgue/lower) "doM" = ( /obj/structure/cable/green{ @@ -5370,14 +5392,6 @@ }, /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 @@ -5674,7 +5688,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/maintenance/engineering) +/area/maintenance/operations) "dXd" = ( /turf/simulated/floor/plating, /area/engineering/drone_fabrication) @@ -6335,13 +6349,14 @@ /turf/simulated/floor/wood, /area/shuttle/intrepid/quarters) "evA" = ( -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "shutters_deck1_morgue2"; - name = "Viewing Shutter" +/obj/effect/floor_decal/corner/lime{ + dir = 10 }, -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, -/turf/simulated/floor/tiled/full, +/obj/effect/landmark{ + name = "borerstart" + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled, /area/medical/morgue/lower) "ewy" = ( /obj/effect/floor_decal/industrial/outline/red, @@ -6642,6 +6657,10 @@ }, /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 @@ -7706,6 +7725,29 @@ /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" @@ -8230,12 +8272,6 @@ }, /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, @@ -10087,6 +10123,9 @@ /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 }, @@ -10097,10 +10136,6 @@ 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 @@ -11902,7 +11937,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "ijU" = ( /obj/random/junk, /obj/effect/decal/cleanable/dirt, @@ -12366,6 +12401,23 @@ 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 @@ -12432,10 +12484,8 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/deck1) "iJi" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/obj/structure/window/shuttle/scc_space_ship/cardinal, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/outpost/research/anomaly_storage) "iJt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12972,7 +13022,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "jaP" = ( /obj/machinery/computer/general_air_control/large_tank_control/terminal{ sensors = list("starboard_prop_sensor"="Starboard Propulsion Sensor"); @@ -13319,28 +13369,27 @@ }, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/port/deck1) -"joI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/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/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/machinery/firealarm/west, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/lime/full{ - dir = 8 +/obj/structure/closet/crate{ + name = "Cremation Urn Materials" }, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Morgue Elevator" +/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, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 }, -/turf/simulated/floor/tiled, /area/medical/morgue/lower) "jpl" = ( /obj/structure/shuttle_part/scc/research{ @@ -14222,13 +14271,24 @@ /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 }, -/turf/simulated/floor/tiled, +/obj/structure/plasticflaps/airtight{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "jTJ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ @@ -14348,6 +14408,9 @@ /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 }, @@ -14864,7 +14927,7 @@ "kqO" = ( /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "kqT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -15578,9 +15641,6 @@ /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" = ( @@ -15823,6 +15883,15 @@ }, /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 @@ -16228,13 +16297,6 @@ /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, @@ -16641,10 +16703,22 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_storage) "lEQ" = ( -/obj/effect/floor_decal/industrial/warning/corner{ +/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{ dir = 8 }, -/turf/simulated/wall, +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 + }, /area/medical/morgue/lower) "lFa" = ( /obj/machinery/hologram/holopad/long_range, @@ -17792,6 +17866,9 @@ /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 }, @@ -18870,6 +18947,17 @@ }, /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 @@ -19123,13 +19211,6 @@ }, /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, @@ -23604,14 +23685,23 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint) "qks" = ( -/obj/machinery/button/remote/blast_door{ - id = "shutters_deck1_morgue2"; - name = "Viewing Shutters"; - dir = 4; - pixel_x = 20 +/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/structure/table/steel, -/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/medical/morgue/lower) "qlv" = ( @@ -23907,7 +23997,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "qvl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24107,17 +24197,12 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "qBC" = ( -/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/structure/railing/mapped, +/obj/effect/floor_decal/corner/lime{ + dir = 10 }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled, /area/medical/morgue/lower) "qBU" = ( /obj/structure/cable{ @@ -24589,15 +24674,18 @@ /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 @@ -25176,16 +25264,16 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "rpa" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/lime{ - dir = 5 - }, -/obj/structure/platform_stairs/ramp/east_west{ - dir = 4 +/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 + }, /turf/simulated/floor/tiled/white{ name = "cooled white floor"; temperature = 278.15 @@ -25302,19 +25390,6 @@ }, /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" @@ -25630,6 +25705,9 @@ /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 }, @@ -25638,11 +25716,11 @@ name = "Viewing Shutters"; pixel_y = 25 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -26033,7 +26111,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/trash_pile, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "rTG" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -26205,14 +26283,6 @@ /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{ @@ -26414,7 +26484,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/stack/tile/floor, /turf/simulated/floor/tiled, -/area/maintenance/engineering) +/area/maintenance/operations) "skq" = ( /obj/effect/floor_decal/corner/lime/full{ dir = 8 @@ -27307,16 +27377,16 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "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 @@ -28198,7 +28268,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "txa" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28565,7 +28635,7 @@ /obj/effect/decal/cleanable/dirt, /obj/random/junk, /turf/simulated/floor/tiled, -/area/maintenance/engineering) +/area/maintenance/operations) "tJq" = ( /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/effect/floor_decal/industrial/warning{ @@ -29564,7 +29634,7 @@ "uqE" = ( /obj/structure/trash_pile, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "urr" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -30842,6 +30912,11 @@ }, /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 @@ -30895,7 +30970,7 @@ /obj/random/junk, /obj/machinery/alarm/north, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "vjM" = ( /obj/effect/floor_decal/corner/yellow{ dir = 6 @@ -30940,26 +31015,6 @@ /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" @@ -31653,9 +31708,6 @@ /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 @@ -32250,7 +32302,7 @@ icon_state = "medium" }, /turf/simulated/floor/tiled, -/area/maintenance/engineering) +/area/maintenance/operations) "wjH" = ( /obj/effect/floor_decal/corner/yellow{ dir = 9 @@ -32510,7 +32562,7 @@ "wqj" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "wqr" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 4 @@ -32593,15 +32645,16 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "wsT" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/effect/floor_decal/corner/lime{ - dir = 9 + dir = 10 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/turf/simulated/floor/tiled/white{ + name = "cooled white floor"; + temperature = 278.15 }, -/turf/simulated/floor/tiled, /area/medical/morgue/lower) "wtl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32907,19 +32960,6 @@ }, /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" @@ -33212,23 +33252,6 @@ }, /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) @@ -33602,10 +33625,13 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod3) "xej" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, /obj/machinery/light/small, -/obj/structure/table/steel, -/obj/machinery/camera/network/medbay{ - c_tag = "Medical - Autopsy and Cremation" +/obj/effect/floor_decal/corner/lime/full, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, /turf/simulated/floor/tiled, /area/medical/morgue/lower) @@ -33671,8 +33697,10 @@ 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" = ( @@ -33866,10 +33894,6 @@ }, /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" @@ -34498,7 +34522,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/maintenance/engineering) +/area/maintenance/operations) "xCn" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, @@ -34517,14 +34541,6 @@ 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" = ( @@ -34846,6 +34862,15 @@ }, /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 @@ -34991,9 +35016,7 @@ /turf/simulated/floor/tiled, /area/rnd/eva) "xRv" = ( -/obj/structure/platform_stairs/ramp/north_south{ - dir = 8 - }, +/obj/structure/platform_stairs/full, /turf/simulated/floor/plating, /area/hangar/auxiliary) "xRF" = ( @@ -35272,11 +35295,13 @@ /turf/simulated/floor/tiled, /area/hangar/auxiliary) "yau" = ( -/obj/effect/landmark{ - name = "borerstart" +/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/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/full, /area/medical/morgue/lower) "yaP" = ( /obj/structure/cable/green{ @@ -35534,6 +35559,38 @@ }, /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 @@ -45776,7 +45833,7 @@ eSV eSV hTk wVV -loY +ymn wVV wVV dLh @@ -48413,7 +48470,7 @@ eSV eSV eSV hTk -rZC +ymm wVV wVV dod @@ -48829,7 +48886,7 @@ lIg lIg lIg xCD -lIg +aYY qkh qkh qkh @@ -49032,9 +49089,9 @@ ege pPU lIg gRa -lIg -cnR -vkj +qBC +fDD +fDD lIg ueg vqU @@ -49236,8 +49293,8 @@ rQp qZW jZV evA -joI -dKN +gMp +fDD lIg rPA vqU @@ -49439,10 +49496,10 @@ mst qZW qVO qBC -wHO -rsi +fDD +fDD lIg -tkX +vqU fCT niw gvZ @@ -49641,7 +49698,7 @@ sRe qEk lIg rFO -lIg +cuA qks xej lIg @@ -49844,11 +49901,11 @@ wYE xll iDM xgE -lIg -lIg -lIg -lIg -lIg +kWx +xNb +aMh +iFL +vqU jUl tZY jpT @@ -50049,9 +50106,9 @@ lIg mon pnZ kLR -fDD -fDD +mZr lIg +rPA oDv avx wPz @@ -50249,12 +50306,12 @@ hQO skq caN lIg -amP +lIg jTl yau -gMp -fDD lIg +lIg +vqU oDv tIS wkD @@ -50455,9 +50512,9 @@ lIg joW doK wsT -fDD -fDD +vif lIg +vqU oDv tIS wkD @@ -50655,12 +50712,12 @@ grm wOP rUU lIg -lIg -lIg +fmL +awf lEQ +eHp lIg -lIg -lIg +tkX ohS rRb wkD @@ -50858,12 +50915,12 @@ lIg lIg lIg lIg -vLE -cgP -cgP -vLE -jsV -xkE +lIg +lIg +lIg +lIg +lIg +vqU oDv tIS wkD @@ -51064,9 +51121,9 @@ icm twX wqj tJg -vLE -jsV -xkE +fCT +nnw +vqU oDv tIS wkD @@ -51268,8 +51325,8 @@ vjI sko wjr rTF -jsV -nhK +nnw +rPA oDv xEd pWZ @@ -51472,7 +51529,7 @@ ijn dWL bDl sRd -xkE +vqU teA tYS bKP @@ -51876,7 +51933,7 @@ icm cqu kqO jaN -vLE +fCT oOk hPn ych @@ -52076,10 +52133,10 @@ khO icm icm icm -jsV -jsV +nnw +nnw quA -jsV +nnw oOk jrr lyU @@ -53876,7 +53933,7 @@ pQv ybl cqE tGU -loY +gVx trc oWg fZr @@ -62241,7 +62298,7 @@ xtK xtK xtK xXt -wRA +yml pPV pPV pPV @@ -62648,7 +62705,7 @@ fIp xtK rrR ows -fIi +xRv 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 0e6da835453..354cb30b7da 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -376,24 +376,6 @@ }, /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; @@ -2162,9 +2144,13 @@ /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) @@ -3089,10 +3075,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/platform_stairs/ramp/east_west{ - dir = 4 +/obj/structure/platform_stairs/full/east_west_cap{ + dir = 8 }, -/obj/structure/platform/ledge, +/obj/structure/platform/cutout, /turf/simulated/floor/tiled, /area/hallway/engineering) "bpa" = ( @@ -4308,9 +4294,6 @@ /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" = ( @@ -4543,13 +4526,6 @@ /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, @@ -5545,12 +5521,22 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "csx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/machinery/vending/medical{ + density = 0; + pixel_x = -1; + pixel_y = 32 }, -/obj/machinery/computer/shuttle_control/multi/lift/medical, -/turf/simulated/floor/tiled/dark/full, -/area/turbolift/scc_ship/morgue_lift) +/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) "csL" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -5849,13 +5835,6 @@ }, /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{ @@ -6496,13 +6475,19 @@ /turf/simulated/floor/wood, /area/horizon/library) "cSs" = ( -/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 +/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 }, /turf/simulated/floor/tiled/white, /area/hallway/medical) @@ -6882,13 +6867,11 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/kitchen/freezer) "def" = ( -/obj/structure/table/standard, -/obj/item/storage/box/bodybags{ - pixel_x = 4; - pixel_y = 4 +/obj/effect/floor_decal/corner_wide/green{ + dir = 5 }, -/obj/item/storage/box/bodybags{ - pixel_y = -1 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/hallway/medical) @@ -12158,6 +12141,13 @@ }, /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{ @@ -14748,12 +14738,8 @@ /obj/effect/floor_decal/corner/mauve{ dir = 10 }, -/obj/structure/platform_stairs/ramp/north_south{ - dir = 1; - pixel_x = 16 - }, -/obj/structure/platform_stairs/ramp/north_south{ - pixel_x = -16 +/obj/structure/platform_stairs{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/rnd/lab) @@ -16065,12 +16051,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "hlu" = ( +/obj/machinery/papershredder, /obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 4 }, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled/white, /area/hallway/medical) "hlK" = ( @@ -16355,9 +16340,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "hrC" = ( @@ -17158,7 +17140,7 @@ /turf/simulated/floor/tiled, /area/rnd/hallway/secondary) "hIq" = ( -/obj/structure/platform_stairs/ramp/east_west, +/obj/structure/platform_stairs/full/east_west_cap, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "hIz" = ( @@ -18195,13 +18177,13 @@ /turf/simulated/floor/tiled/dark, /area/operations/office) "ikB" = ( -/obj/structure/platform_stairs/ramp/east_west{ - dir = 4 +/obj/structure/platform_stairs/full/east_west_cap{ + dir = 8 }, +/obj/structure/platform/cutout, /obj/structure/platform{ dir = 1 }, -/obj/structure/platform/ledge, /turf/simulated/floor/tiled, /area/operations/lower/machinist/surgicalbay) "ikT" = ( @@ -19376,11 +19358,6 @@ /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" = ( @@ -19472,12 +19449,6 @@ /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" = ( @@ -20439,12 +20410,6 @@ }, /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" = ( @@ -20471,12 +20436,6 @@ /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" = ( @@ -21221,13 +21180,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "jDU" = ( -/obj/machinery/papershredder{ - pixel_x = 7 - }, +/obj/structure/platform, /obj/structure/filingcabinet/filingcabinet{ pixel_x = -7 }, -/obj/structure/platform, +/obj/machinery/papershredder{ + pixel_x = 7 + }, /turf/simulated/floor/tiled/dark, /area/rnd/lab) "jDZ" = ( @@ -22718,6 +22677,13 @@ }, /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{ @@ -23802,8 +23768,19 @@ /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 @@ -27953,7 +27930,7 @@ /turf/simulated/floor/wood, /area/horizon/bar) "mOH" = ( -/obj/structure/platform_stairs/ramp/east_west{ +/obj/structure/platform_stairs/full/east_west_cap{ dir = 1 }, /turf/simulated/floor/tiled/dark, @@ -30854,9 +30831,20 @@ /obj/machinery/camera/network/medbay{ c_tag = "Medical - Hallway 2" }, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 +/obj/structure/railing/mapped{ + dir = 8 }, +/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" = ( @@ -31544,10 +31532,6 @@ /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, @@ -33214,16 +33198,6 @@ }, /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 @@ -34035,6 +34009,15 @@ /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 @@ -35012,18 +34995,6 @@ 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" = ( @@ -39954,7 +39925,10 @@ /turf/simulated/floor/wood, /area/rnd/hallway) "syj" = ( -/obj/structure/platform_stairs/ramp/east_west, +/obj/structure/platform/cutout{ + dir = 8 + }, +/obj/structure/platform_stairs/full/east_west_cap, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "sym" = ( @@ -41257,8 +41231,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/platform_stairs/ramp/east_west, -/obj/structure/platform/ledge, +/obj/structure/platform_stairs/full/east_west_cap, +/obj/structure/platform/cutout{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "thL" = ( @@ -41965,17 +41941,10 @@ /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" = ( @@ -42174,6 +42143,26 @@ }, /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, @@ -42254,6 +42243,18 @@ }, /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, @@ -42299,17 +42300,6 @@ }, /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" = ( @@ -44129,6 +44119,7 @@ /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{ @@ -44137,9 +44128,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/platform_stairs/ramp/north_south{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/operations/lower/machinist) "uuI" = ( @@ -44448,9 +44436,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" = ( @@ -44745,15 +44733,15 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "uKB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/platform_stairs/ramp/east_west{ - dir = 1 +/obj/structure/platform_stairs/full{ + dir = 8 }, /obj/structure/platform{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) "uKJ" = ( @@ -47499,19 +47487,6 @@ /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" @@ -50406,30 +50381,26 @@ /turf/simulated/floor/grass, /area/horizon/hallway/deck_two/fore) "xlQ" = ( -/obj/structure/railing/mapped{ +/obj/item/modular_computer/console/preset/medical{ dir = 8 }, /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/table/standard, -/obj/item/reagent_containers/spray/cleaner{ - pixel_y = 2 +/obj/structure/railing/mapped{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/hallway/medical) "xlV" = ( /obj/machinery/door/firedoor, -/obj/machinery/light, -/obj/structure/platform_stairs/ramp/east_west{ - dir = 8 +/obj/structure/platform_stairs/full{ + dir = 4 }, /obj/structure/platform{ dir = 1 }, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "xmt" = ( @@ -50715,6 +50686,12 @@ /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" @@ -50756,10 +50733,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/platform_stairs/ramp/east_west{ - dir = 4 +/obj/structure/platform_stairs/full/east_west_cap{ + dir = 8 }, -/obj/structure/platform/ledge, +/obj/structure/platform/cutout, /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "xxa" = ( @@ -51477,13 +51454,15 @@ /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_b) "xNn" = ( -/obj/structure/table/standard, -/obj/machinery/recharger, -/obj/effect/floor_decal/corner_wide/green/full{ - dir = 8 +/obj/machinery/computer/shuttle_control/lift{ + pixel_y = -1; + shuttle_tag = "Morgue Lift" }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/morgue_lift) "xNu" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-4" @@ -52701,14 +52680,12 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "ykA" = ( -/obj/structure/table/standard, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/floor_decal/corner_wide/green{ - dir = 5 +/obj/effect/shuttle_landmark/lift/morgue_top, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/hallway/medical) +/turf/simulated/floor/tiled/dark/full, +/area/turbolift/scc_ship/morgue_lift) "ylh" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -66188,7 +66165,7 @@ dtr mqR dKR xNn -plX +oza cSs rCf nQm @@ -66390,7 +66367,7 @@ rFR wuJ gnD ykA -cDg +vKH def xLG nQm @@ -66591,9 +66568,9 @@ scG weY jqw dKR -vYl -oyA -xur +ifK +cxu +tGb iLT noR xKU @@ -66794,8 +66771,8 @@ rTP tat dKR oif -xur -xur +tFy +pKh leU nQm nQm @@ -67199,7 +67176,7 @@ dKR dKR nIi csx -oza +xur jmE aUz xur @@ -67400,8 +67377,8 @@ vQV hAu vBn wXA -bSw -vKH +jWj +xva hrf gPG tcQ @@ -67602,8 +67579,8 @@ bRm paL rTR wXA -ifK -cxu +fCI +kqi qhz qwJ mIO @@ -67806,7 +67783,7 @@ eMp wXA xlQ hlu -ail +hHE 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 7de0eed9b0c..4f4054f3eeb 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -55,15 +55,6 @@ }, /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 @@ -1263,16 +1254,6 @@ /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 @@ -2325,8 +2306,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/ramp/north_south{ - dir = 4 +/obj/structure/platform_stairs/full{ + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge) @@ -3056,6 +3037,7 @@ }, /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" = ( @@ -4230,10 +4212,6 @@ /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 @@ -5066,23 +5044,6 @@ }, /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 @@ -7295,13 +7256,6 @@ "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; @@ -8624,9 +8578,6 @@ /obj/structure/platform/ledge{ dir = 4 }, -/obj/structure/platform_deco/ledge{ - dir = 8 - }, /turf/simulated/open, /area/hallway/medical/upper) "gcV" = ( @@ -8912,8 +8863,8 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 }, -/obj/structure/platform_stairs/ramp/north_south{ - dir = 8 +/obj/structure/platform_stairs/full{ + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge) @@ -11501,15 +11452,15 @@ /obj/effect/floor_decal/corner/dark_blue{ dir = 10 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor, -/obj/structure/platform_stairs/ramp/east_west{ +/obj/structure/platform_stairs/full{ dir = 4 }, +/obj/structure/platform/cutout, /obj/structure/platform{ dir = 1 }, -/obj/structure/platform/ledge, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/bridge/upperdeck) "hRV" = ( @@ -14634,15 +14585,6 @@ }, /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) @@ -20868,12 +20810,6 @@ /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{ @@ -23198,23 +23134,6 @@ }, /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, @@ -26113,14 +26032,6 @@ }, /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" @@ -26314,18 +26225,6 @@ /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" @@ -27907,7 +27806,6 @@ /obj/structure/platform_deco/ledge{ dir = 5 }, -/obj/structure/platform_deco/ledge, /turf/simulated/open, /area/hallway/medical/upper) "sMq" = ( @@ -29669,13 +29567,6 @@ }, /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 @@ -34981,12 +34872,6 @@ /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" = ( @@ -49846,7 +49731,7 @@ ewp xsy gUY sMd -rPp +gcR xHj gcR uJm @@ -50047,10 +49932,10 @@ oZE vLY pOM jRh -dSy +umT dVW +nHR dVW -tZg rle iCT uGa @@ -50249,10 +50134,10 @@ vKa fTH wtd cin -jZH -dlt -dVW -rIM +gPn +nHR +nHR +nHR fFg dSw iBF @@ -50451,10 +50336,10 @@ hLw vLY aaF nXf -pDi +umT dVW +nHR dVW -tZg rle qMs wLL @@ -50653,10 +50538,10 @@ vLY vLY daa iiQ -fmC -acn -aSL -oaH +umT +dVW +nHR +dVW rle iYu xVe