From 07e4a6a677d860ab9986fc42262e4b6c2f99b34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Thu, 23 May 2024 18:50:40 -0600 Subject: [PATCH] blah --- _maps/map_files/vonneumann/vnmk3.dmm | 812 +++++++++++++-------------- 1 file changed, 387 insertions(+), 425 deletions(-) diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm index baa825178a1..4fcd0e22199 100644 --- a/_maps/map_files/vonneumann/vnmk3.dmm +++ b/_maps/map_files/vonneumann/vnmk3.dmm @@ -3271,7 +3271,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering/reactor_control) "hG" = ( @@ -3662,21 +3661,8 @@ }, /area/nsv/weapons/fore) "iA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/ship/engineering/glass, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/landmark/zebra_interlock_point, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/engineering/reactor_control) +/turf/template_noop, +/area/maintenance/nsv/ftlroom) "iB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -3695,15 +3681,8 @@ /turf/open/floor/carpet/ship/beige_carpet, /area/nsv/weapons/port) "iD" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ - icon_state = "pipe11-5"; - name = "layer5"; - piping_layer = 5; - dir = 10 - }, -/turf/open/floor/carpet/ship, -/area/ai_monitored/storage/eva) +/turf/template_noop, +/area/maintenance/central) "iE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -4354,14 +4333,10 @@ /turf/open/floor/carpet/ship/red_carpet, /area/crew_quarters/heads/hos) "kk" = ( -/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ - icon_state = "pipe11-5"; - name = "layer5"; - piping_layer = 5; - dir = 4 - }, -/turf/open/floor/carpet/ship, -/area/ai_monitored/storage/eva) +/obj/effect/spawner/lootdrop/grille_or_trash, +/obj/effect/spawner/lootdrop/trap, +/turf/open/floor/plating, +/area/maintenance/central) "kl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4608,14 +4583,10 @@ /turf/open/floor/monotile/light, /area/medical/medbay) "kR" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ - dir = 1; - id = "FTLinput" - }, -/obj/effect/spawner/structure/window/reinforced/ship, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/plating, -/area/maintenance/nsv/ftlroom) +/obj/structure/lattice, +/obj/structure/grille/wall, +/turf/open/space/basic, +/area/space/nearstation) "kS" = ( /obj/machinery/atmospherics/components/binary/circulator/cold{ dir = 4 @@ -5648,12 +5619,10 @@ /turf/open/space/basic, /area/space/nearstation) "ns" = ( -/obj/machinery/door/airlock/ship/engineering/glass, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/carpet/ship/orange_carpet, -/area/engine/engineering/reactor_control) +/obj/effect/spawner/structure/window/reinforced/ship, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/turf/open/floor/plating, +/area/maintenance/nsv/ftlroom) "nt" = ( /obj/structure/closet/crate/engineering/electrical, /turf/open/floor/carpet/ship/orange_carpet, @@ -6941,9 +6910,6 @@ /obj/effect/landmark/start/cyborg, /turf/open/floor/carpet/ship, /area/ai_monitored/turret_protected/aisat_interior) -"qG" = ( -/turf/closed/wall/r_wall/ship, -/area/space/nearstation) "qH" = ( /obj/machinery/field/generator, /obj/machinery/light{ @@ -7166,9 +7132,9 @@ /turf/open/floor/circuit/green/anim, /area/nsv/weapons) "rk" = ( -/obj/effect/spawner/lootdrop/trap, -/turf/open/floor/plating, -/area/maintenance/central) +/obj/effect/spawner/room/threexthree, +/turf/template_noop, +/area/maintenance/nsv/ftlroom) "rl" = ( /obj/effect/turf_decal/pool{ dir = 8 @@ -7620,16 +7586,6 @@ /obj/machinery/squad_vendor, /turf/closed/wall/r_wall/ship, /area/ai_monitored/turret_protected/ai) -"st" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/atmospherics/pipe/simple/green/hidden/layer4{ - icon_state = "pipe11-5"; - name = "layer5"; - piping_layer = 5; - dir = 5 - }, -/turf/open/floor/carpet/ship, -/area/ai_monitored/storage/eva) "su" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10109,8 +10065,18 @@ /turf/open/floor/plating, /area/maintenance/aft/secondary) "yf" = ( -/turf/closed/wall/r_wall/ship, -/area/maintenance/aft) +/obj/machinery/atmospherics/pipe/simple/brown/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "yg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10352,7 +10318,6 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/carpet/ship/orange_carpet, /area/engine/engineering/reactor_control) "yI" = ( @@ -19983,9 +19948,6 @@ }, /turf/open/floor/engine, /area/engine/armour_pump) -"Vt" = ( -/turf/closed/wall/r_wall/ship, -/area/engine/atmos/port_atmos) "Vu" = ( /obj/effect/landmark/zebra_interlock_point, /obj/effect/mapping_helpers/airlock/unres{ @@ -29203,23 +29165,23 @@ fh fh fh gM -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw xX fh fh @@ -29404,25 +29366,25 @@ fh fh fh bg -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG -qG +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw +tw RW fh fh @@ -29605,27 +29567,27 @@ fh fh CK fy -qG -qG -qG +tw +tw +tw DS tw Rm Rm Rm Rm -qG +tw DS -qG +tw Rm Rm Rm Rm tw DS -qG -qG -qG +tw +tw +tw xX CK fh @@ -29807,8 +29769,8 @@ fh fh CK cK -qG -qG +tw +tw Pz uw sQ @@ -29826,8 +29788,8 @@ eg sQ Gs IO -qG -qG +tw +tw nV CK fh @@ -30009,8 +29971,8 @@ fh fh CK cK -qG -qG +tw +tw Jy HH NU @@ -30028,8 +29990,8 @@ gR bS XO OR -qG -qG +tw +tw nV CK fh @@ -30211,8 +30173,8 @@ fh fh CK uL -qG -qG +tw +tw Jy SX SX @@ -30230,8 +30192,8 @@ SX SX SX ZS -qG -qG +tw +tw cA CK fh @@ -30414,7 +30376,7 @@ fh CK Yy bk -qG +tw Jy SX SX @@ -30432,7 +30394,7 @@ SX SX SX ZS -qG +tw bk Yy CK @@ -30616,7 +30578,7 @@ fh CK Yy xk -qG +tw Jy SX SX @@ -30634,7 +30596,7 @@ SX SX SX ZS -qG +tw xk Yy CK @@ -30818,7 +30780,7 @@ fh CK Yy xk -qG +tw Jy SX SX @@ -30836,7 +30798,7 @@ SX SX SX ZS -qG +tw xk Yy CK @@ -31020,7 +30982,7 @@ fh CK Yy xk -qG +tw Jy SX SX @@ -31038,7 +31000,7 @@ SX SX SX ZS -qG +tw xk Yy CK @@ -31222,7 +31184,7 @@ fh CK Yy gM -qG +tw Jy SX SX @@ -31240,7 +31202,7 @@ SX SX SX ZS -qG +tw xX Yy CK @@ -31423,8 +31385,8 @@ fh fh CK Hb -qG -qG +tw +tw Jy SX SX @@ -31442,8 +31404,8 @@ SX SX SX OR -qG -qG +tw +tw nr CK fh @@ -31624,9 +31586,9 @@ fh fh fh fy -qG -qG -qG +tw +tw +tw bK Lp SX @@ -31644,9 +31606,9 @@ SX SX zX rC -qG -qG -qG +tw +tw +tw Qe fh fh @@ -31825,11 +31787,11 @@ Je Mf Mf tb -qG -qG -qG -qG -qG +tw +tw +tw +tw +tw Qt SX SX @@ -31845,11 +31807,11 @@ SX SX SX Qt -qG -qG -qG -qG -qG +tw +tw +tw +tw +tw Mf Mf tb @@ -32023,15 +31985,15 @@ gM Mf Mf tb -qG +tw Sp Sp Sp -qG -qG -qG -qG -qG +tw +tw +tw +tw +tw Qt SX SX @@ -32047,15 +32009,15 @@ SX SX Hi Gf -qG -qG -qG -qG -qG +tw +tw +tw +tw +tw Sp Sp Sp -qG +tw Mf Mf tb @@ -32221,11 +32183,11 @@ Je Mf Mf tb -qG +tw Sp Sp Sp -qG +tw Sp Sp Sp @@ -32257,11 +32219,11 @@ nS Sp Sp Sp -qG +tw Sp Sp Sp -qG +tw Mf Mf tb @@ -32419,11 +32381,11 @@ fh xk xk xk -qG +tw Sp Sp Sp -qG +tw Sp Sp Sp @@ -32456,18 +32418,18 @@ pP xw Of nS -qG -qG -qG -qG +tw +tw +tw +tw Sp Sp Sp -qG +tw Sp Sp Sp -qG +tw xk xk xk @@ -32621,14 +32583,14 @@ fh xk xk xk -qG +tw Sp Sp Sp -qG -qG -qG -qG +tw +tw +tw +tw wf rM qH @@ -32647,7 +32609,7 @@ gP Ju vQ vQ -ns +Iw IQ EI pu @@ -32662,14 +32624,14 @@ Mh Mh Mh Mh -qG -qG -qG -qG +tw +tw +tw +tw Sp Sp Sp -qG +tw xk xk xk @@ -32818,7 +32780,7 @@ fh fh fh fh -xk +fh gM rA Pg @@ -32871,7 +32833,7 @@ CS CS CS CS -qG +tw rA Pg rA @@ -33021,10 +32983,10 @@ fh fh fh Je -yf -yf +yU +yU Oc -yf +yU Cz Xo Eg @@ -33220,11 +33182,11 @@ fh fh fh fh -xk +fh gM -qG -yf -yf +tw +yU +yU cb XN XB @@ -33280,7 +33242,7 @@ Ad gV Ad Ad -qG +tw xX fh fh @@ -33423,12 +33385,12 @@ fh fh fh gM -qG -qG -yf +tw +tw +yU ZG iX -yf +yU Cz YG MU @@ -33482,8 +33444,8 @@ gV bw OL Ad -qG -qG +tw +tw xX fh fh @@ -33624,13 +33586,13 @@ fh fh fh fh -qG -qG -qG -yf +tw +tw +tw +yU Bo iB -yf +yU Cz yO Ox @@ -33684,9 +33646,9 @@ gV Ak gV Ad -qG -qG -qG +tw +tw +tw fh fh fh @@ -33829,7 +33791,7 @@ fh er Sp Lz -yf +yU uU mf Cz @@ -34031,7 +33993,7 @@ fh er Sp Sp -yf +yU lW Bs WZ @@ -34043,15 +34005,15 @@ eJ wq KC jY -Vt -Vt -Vt -Vt -Vt -Vt -Vt +cx +cx +cx +cx +cx +cx +cx EG -Vt +cx iV fO Vh @@ -34233,7 +34195,7 @@ fh er Sp Sp -yf +yU Bo iB WZ @@ -34243,17 +34205,17 @@ qs qs qs WZ -Vt -Vt -Vt +cx +cx +cx JQ Id -Vt +cx yd et -Vt +cx eq -Vt +cx kf Dg MK @@ -34432,28 +34394,28 @@ fh fh fh ja -qG -qG -qG -yf +tw +tw +tw +yU TG CT -Vt -Vt -Vt -Vt -Vt -Vt -Vt +cx +cx +cx +cx +cx +cx +cx po tf -Vt +cx wc Eh -Vt +cx lB wp -Vt +cx xe ao eu @@ -34492,9 +34454,9 @@ gz rT Mv Ad -qG -qG -qG +tw +tw +tw TL fh fh @@ -34637,22 +34599,22 @@ fh er Sp Lz -yf +yU Bo iB -Vt -Vt -Vt -Vt -Vt -Vt -Vt +cx +cx +cx +cx +cx +cx +cx on dD -Vt +cx UL UL -Vt +cx UL UL Gn @@ -34839,19 +34801,19 @@ fh er Sp Sp -yf +yU na iB -Vt +cx lk sZ -Vt +cx Kc rK -Vt +cx UL UL -Vt +cx fZ yl QZ @@ -35041,16 +35003,16 @@ fh er Sp Sp -yf +yU Bo CT -Vt +cx by xy -Vt +cx Qh VI -Vt +cx aL yl lv @@ -35070,7 +35032,7 @@ hv Ea Uw Xz -iA +Uw tQ hv FB @@ -35240,19 +35202,19 @@ fh fh fh fh -qG -qG -qG -yf +tw +tw +tw +yU wl Sb -Vt +cx UL UL -Vt +cx UL UL -Vt +cx SZ HE fd @@ -35300,9 +35262,9 @@ gz Qk cL Ad -qG -qG -qG +tw +tw +tw fh fh fh @@ -35445,10 +35407,10 @@ fh er Sp Lz -yf +yU wl CT -Vt +cx Lh yl vt @@ -35465,7 +35427,7 @@ BC cg hg ia -Vt +cx jb mB qe @@ -35647,7 +35609,7 @@ fh er Sp Sp -yf +yU zD iB EG @@ -35667,7 +35629,7 @@ NW vC Pl rz -Vt +cx fe lI db @@ -35849,7 +35811,7 @@ fh er Sp Sp -yf +yU uv CT EG @@ -36048,13 +36010,13 @@ fh fh fh fh -qG -qG -qG -yf +tw +tw +tw +yU qX zq -Vt +cx Yp yl yl @@ -36071,7 +36033,7 @@ FG IG JD yl -Vt +cx fe db Xu @@ -36108,9 +36070,9 @@ Wr oe OH Ad -qG -qG -qG +tw +tw +tw fh fh fh @@ -36253,7 +36215,7 @@ fh er Sp Lz -yf +yU AB CT Bm @@ -36267,8 +36229,8 @@ JM oD jK nJ -Vt -Vt +cx +cx Bm Lf bO @@ -36455,7 +36417,7 @@ fh er Sp Sp -yf +yU TG iB EG @@ -36657,7 +36619,7 @@ fh er Sp Sp -yf +yU AB iB EG @@ -36702,11 +36664,11 @@ gZ ys Zv oS -st -Sf -aX -Jf -yL +oS +oS +Su +ns +ZZ Zj yL gz @@ -36856,13 +36818,13 @@ fh fh fh fh -qG -qG -qG -yf +tw +tw +tw +yU Bo tH -Vt +cx Mo Jt yl @@ -36873,9 +36835,9 @@ kO Ui Zs By -Vt -Vt -Vt +cx +cx +cx Lf zm ej @@ -36904,21 +36866,21 @@ Ai lw aX aX -kk aX aX -Jf -yL -yL -yL +aX +gz +gz +gz +gz gz bb oe EA Ad -qG -qG -qG +tw +tw +tw fh fh fh @@ -37061,12 +37023,12 @@ fh er Sp Lz -yf +yU Ur TB -Vt +cx Ei -Vt +cx kI ex Ro @@ -37106,14 +37068,14 @@ iO PM Sf hE -iD -oS -Su -kR -ZZ -yL -yL +Sf +Sf +aX gz +iA +iA +rk +qv qC oe cL @@ -37263,12 +37225,12 @@ fh er Sp Sp -yf +yU Tr qZ -Vt +cx Ti -Vt +cx fk cd TX @@ -37312,10 +37274,10 @@ Ai Ai Ai gz -gz -gz -gz -gz +iA +iA +iA +qv kF oe cL @@ -37465,22 +37427,22 @@ fh er Sp Sp -yf +yU dG iX -Vt +cx Mo -Vt -Vt +cx +cx Ay Ay -Vt -Vt +cx +cx es yp By -Vt -Vt +cx +cx Gn iN Yf @@ -37509,14 +37471,14 @@ qq Tw uI uI -uI -nB -uI -kP vY -uI -uI +nB jc +kP +aB +iD +iD +iD aB gV oe @@ -37664,13 +37626,13 @@ fh fh fh ja -qG -qG -qG -yf +tw +tw +tw +yU YP Zo -Vt +cx Tv EF eH @@ -37715,18 +37677,18 @@ uI uI uI kP -kP -rk -kP -kP aB -gV +aB +kk +aB +aB +ZI BI ye Ad -qG -qG -qG +tw +tw +tw TL fh fh @@ -38071,7 +38033,7 @@ fh wB Sp Sp -yf +yU YP Sd cx @@ -38124,7 +38086,7 @@ uZ uI kP aB -gV +kF WD gV Ad @@ -38273,7 +38235,7 @@ fh wB Sp Sp -yf +yU Bo Sd dd @@ -38327,8 +38289,8 @@ XL Du Du yI -WD -gV +yf +kF Ad Sp Sp @@ -38473,10 +38435,10 @@ fh fh fh wB -yf -yf -yf -yf +yU +yU +yU +yU af dd jq @@ -38877,11 +38839,11 @@ fh fh fh mq -yf +yU wS Gx -yf -yf +yU +yU dd pb XV @@ -39082,8 +39044,8 @@ SA HI gC bB -qG -qG +tw +tw dd dd ui @@ -39284,9 +39246,9 @@ fh fh pL SA -qG -qG -qG +tw +tw +tw dd dd mm @@ -39487,9 +39449,9 @@ fh fh fh SA -qG -qG -qG +tw +tw +tw dd kH wJ @@ -39690,8 +39652,8 @@ fh fh fh SA -qG -qG +tw +tw dd dd dd @@ -39893,7 +39855,7 @@ fh fh fh SA -qG +tw dd dd dd @@ -42563,7 +42525,7 @@ lL XY Tt Tt -qG +tw eL Yy KA @@ -42765,7 +42727,7 @@ Rl Oa lL Tt -qG +tw eL Yy KA @@ -42967,7 +42929,7 @@ fG fG lL Tt -qG +tw eL Yy KA @@ -43169,7 +43131,7 @@ bp fG lL Tt -qG +tw eL Yy KA @@ -43371,7 +43333,7 @@ fG fG lL Tt -qG +tw eL Yy CK @@ -43573,7 +43535,7 @@ ZR og EX Tt -qG +tw eL Yy CK @@ -43775,7 +43737,7 @@ iW lZ sy Tt -qG +tw eL Yy CK @@ -43977,7 +43939,7 @@ Dm DJ lL Tt -qG +tw eL Yy CK @@ -44179,7 +44141,7 @@ fB NE lL Tt -qG +tw eL Yy CK @@ -44381,7 +44343,7 @@ kK kK qn Tt -qG +tw eL Yy CK @@ -44583,7 +44545,7 @@ VL kK qn Tt -qG +tw eL Yy CK @@ -44785,7 +44747,7 @@ VD kK qn Tt -qG +tw eL Yy CK @@ -44987,7 +44949,7 @@ Bh Bh Es Tt -qG +tw eL Yy CK @@ -45189,7 +45151,7 @@ SM DU xg Tt -qG +tw rn nr CK @@ -47615,7 +47577,7 @@ cS gt gt gt -qG +tw jt CK fh @@ -48019,7 +47981,7 @@ WB gH Ki gt -qG +tw Yy CK fh @@ -51004,8 +50966,8 @@ fh fh fh fh -fh -SA +Yy +wM PP PP PP @@ -51206,9 +51168,9 @@ fh fh fh fh -fh -fh -wB +kR +Yy +cK PP PP NY @@ -51408,9 +51370,9 @@ fh fh fh fh -fh -fh -wB +kR +Yy +cK PP PP hI @@ -51610,9 +51572,9 @@ fh fh fh fh -fh -fh -wB +kR +Yy +cK PP PP wY @@ -51812,9 +51774,9 @@ fh fh fh fh -fh -fh -wB +kR +Yy +cK YX PP PP @@ -52014,9 +51976,9 @@ fh fh fh fh -fh -fh -wB +kR +Yy +cK Db Db DV @@ -52216,9 +52178,9 @@ fh fh fh fh -fh -fh -wB +kR +Yy +cK bB bB bB @@ -52418,9 +52380,9 @@ fh fh fh fh -fh -fh -SA +kR +Yy +wM bB bB bB