diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm index 11bd40bc8526..49187c702df5 100644 --- a/maps/triumph/levels/deck1.dmm +++ b/maps/triumph/levels/deck1.dmm @@ -10839,6 +10839,12 @@ /obj/item/storage/bag/circuits/basic, /turf/simulated/floor, /area/storage/tech) +"Nq" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering) "Nr" = ( /obj/structure/cable{ icon_state = "1-2" @@ -29056,7 +29062,7 @@ qw em em em -Yb +Nq qb dv ID diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index 12dc79f2838f..a319642cfa78 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -1104,7 +1104,7 @@ /obj/machinery/camera/network/outside{ dir = 5 }, -/turf/space, +/turf/simulated/floor/airless/ceiling, /area/space) "dD" = ( /turf/simulated/floor/plating, @@ -7210,6 +7210,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/plating, /area/vacant/vacant_office) +"vi" = ( +/turf/space/basic, +/area/space) "vj" = ( /obj/machinery/power/solar_control, /obj/structure/cable/yellow{ @@ -11294,6 +11297,10 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +"Ia" = ( +/obj/structure/lattice, +/turf/space/basic, +/area/space) "Ib" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -12554,6 +12561,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/dormitory) +"Mh" = ( +/obj/structure/lattice, +/turf/simulated/floor/airless/ceiling, +/area/space) "Mi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -16873,6 +16884,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) +"YP" = ( +/obj/structure/lattice, +/obj/structure/grille, +/turf/simulated/floor/airless/ceiling, +/area/space) "YQ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, @@ -16952,6 +16968,10 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/fitness) +"YZ" = ( +/obj/machinery/camera/network/outside, +/turf/simulated/floor/airless/ceiling, +/area/space) "Za" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -20327,9 +20347,9 @@ ii ii ii ii -ii -Ed -ii +vi +vi +vi vl vl vl @@ -20469,9 +20489,9 @@ ii ii ii ii -ii -rC -ii +vi +vi +vi vl eb ht @@ -20611,9 +20631,9 @@ ii ii ii ii -ii -rC -ii +vi +vi +vi vl eD qh @@ -20753,9 +20773,9 @@ ii ii ii ii -ii -rC -ii +vi +vi +vi vl fw qx @@ -20895,9 +20915,9 @@ ii ii ii ii -ii -Ed -ii +vi +vi +vi vl fQ qE @@ -21353,10 +21373,10 @@ qb qb NK Nm -Ed -Ed -rC -ii +Mh +Mh +YP +qu ii ii ii @@ -21495,11 +21515,11 @@ NR qb hJ Nm -ii -ii -rC -ii -ii +qu +qu +YP +qu +qu ii ii ii @@ -21603,11 +21623,11 @@ ii ii ii ii -ii -ii -rC -Ed -Ed +qu +qu +qu +qu +qu nJ ya xV @@ -21637,11 +21657,11 @@ It PS yK eH -ii -ii -rC -ii -ii +qu +qu +YP +qu +qu ii ii ii @@ -21745,11 +21765,11 @@ ii ii ii ii -ii -ii -rC -ii -ii +qu +qu +qu +qu +qu vl Ye fl @@ -21779,11 +21799,11 @@ JX tJ Zf eH -AU -ii -rC -ii -ii +YZ +qu +YP +qu +qu ii ii ii @@ -21887,11 +21907,11 @@ ii ii ii ii -ii -ii -Ed -ii -cB +qu +qu +qu +qu +qu vl iW ip @@ -21921,11 +21941,11 @@ Dm JU wR eH -ii -ii -rC -ii -ii +qu +qu +YP +qu +qu ii ii ii @@ -22029,11 +22049,11 @@ ii ii ii ii -ii -ii -rC -ii -ii +qu +qu +qu +qu +qu nJ ya op @@ -22063,11 +22083,11 @@ Dm JX fd eH -ii -ii -rC -ii -ii +qu +qu +YP +qu +qu ii ii ii @@ -22172,10 +22192,10 @@ ii ii ii ii -ii -rC -ii -ii +qu +qu +qu +qu vl kb Nh @@ -22205,10 +22225,10 @@ Dm oE rF tA -Ed -Ed -rC -ii +Mh +Mh +YP +qu ii ii ii @@ -22314,10 +22334,10 @@ ii ii ii ii -ii -rC -ii -ii +qu +qu +qu +qu vl Ye oF @@ -22347,10 +22367,10 @@ Dm Qe rF tA -ii -ii -rC -ii +qu +qu +YP +qu ii ii ii @@ -22456,10 +22476,10 @@ ii ii ii ii -ii -rC -ii -ii +qu +qu +qu +qu vl Fc Rr @@ -22489,10 +22509,10 @@ RW RW Yo tA -ii -ii -rC -ii +qu +qu +YP +qu ii ii ii @@ -22598,10 +22618,10 @@ ii ii ii ii -ii -Ed -ii -ii +qu +qu +qu +qu vl lE qE @@ -22631,10 +22651,10 @@ od oE gC tA -ii -ii -rC -ii +qu +qu +YP +qu ii ii ii @@ -22740,10 +22760,10 @@ ii ii ii ii -ii -rC -ii -ii +qu +qu +qu +qu nJ ns vF @@ -22773,10 +22793,10 @@ Ki gI gC tA -ii -ii -rC -ii +qu +qu +YP +qu ii ii ii @@ -22882,10 +22902,10 @@ cs ii ii ii -ii -Ed -ii -ii +qu +qu +qu +qu vl ns vR @@ -22915,10 +22935,10 @@ Ki iM gC tA -ii -ii -rC -ii +qu +qu +YP +qu ii ii ii @@ -23024,10 +23044,10 @@ ii ii ii ii -ii -Ed -ii -ii +qu +qu +qu +qu vl pm xF @@ -23057,10 +23077,10 @@ Ki Mg gC tA -ii -ii -Ed -ii +qu +qu +Mh +qu ii ii ii @@ -23166,10 +23186,10 @@ ii ii ii ii -ii -Ed -ii -ii +qu +qu +qu +qu vl pq op @@ -23199,10 +23219,10 @@ Ki UJ gC tA -ii -ii -Ed -ii +qu +qu +Mh +qu ii ii ii @@ -23308,10 +23328,10 @@ HK HK Rx ii -ii -Ed -Ed -Ed +qu +qu +qu +qu vl ge LC @@ -23341,10 +23361,10 @@ Ki HW gC tA -Ed -Ed -Ed -rC +Mh +Mh +Mh +YP rC rC Ed @@ -23450,10 +23470,10 @@ gn sX Rx ii -ii -Ed -ii -ii +qu +qu +qu +qu vl ns Nh @@ -23483,10 +23503,10 @@ Ki eI gC tA -ii -ii -Ed -ii +qu +qu +Mh +qu ii ii Ed @@ -23592,10 +23612,10 @@ Ht TI Rx ii -ii -Ed -ii -ii +qu +qu +qu +qu vl ns ip @@ -23625,10 +23645,10 @@ oZ RW Yo tA -ii -ii -Ed -ii +qu +qu +Mh +qu ii ii Ed @@ -29259,9 +29279,9 @@ ii ii ii Ed -ii -Ed -ii +qu +Mh +qu Ux wl kk @@ -29269,7 +29289,7 @@ Uv kk TH kz -ii +qu Rj be xk @@ -29309,21 +29329,21 @@ yb ai Mn tA -ii -ii -ii -ii -ii -Ed -ii +qu +qu +qu +qu +qu +Mh +qu dC -ii -ii -ii -Ed -ii -ii -ii +qu +qu +vi +Ia +vi +vi +vi ii ii rC @@ -29401,9 +29421,9 @@ Ed Ed Ed Ed -Ed -Ed -Ed +Mh +Mh +Mh FS UF XJ @@ -29411,7 +29431,7 @@ sA XJ QZ fS -Ed +Mh Rj tB Rj @@ -30016,7 +30036,7 @@ yb yb yb yb -oE +Qe gC cp ii @@ -31266,9 +31286,9 @@ ii ii ii ii -ii -ii -ii +qu +qu +qu Rj aC mQ @@ -31288,9 +31308,9 @@ zk gW gC tA -ii -ii -ii +qu +qu +qu ii ii ii @@ -31408,9 +31428,9 @@ Ed rC rC Ed -Ed -ii -ii +qu +qu +qu Rj tV mQ @@ -31430,9 +31450,9 @@ zk nj fg tA -ii -ii -ii +qu +qu +qu ii ii ii @@ -31549,10 +31569,10 @@ ii ii ii ii -ii Ed -ii -ii +qu +qu +qu Rj aC mQ @@ -31572,9 +31592,9 @@ zk qH gC tA -ii -ii -Ed +qu +qu +qu Ed rC rC @@ -31691,10 +31711,10 @@ ii ii ii ii -ii rC -Ed -Ed +qu +qu +qu Rj aC mQ @@ -31714,10 +31734,10 @@ zk oE gC tA -ii -ii -rC -ii +qu +qu +qu +Ed ii ii ii @@ -31833,10 +31853,10 @@ ii ii ii ii -ii rC -ii -ii +qu +qu +qu Rj aC Gy @@ -31856,8 +31876,9 @@ zk oE gC tA -ii -ii +qu +qu +qu rC ii ii @@ -31890,7 +31911,6 @@ ii ii ii ii -ii cs ii ii @@ -31975,10 +31995,10 @@ ii ii ii ii -ii rC -ii -ii +qu +qu +qu Rj VW VZ @@ -31998,8 +32018,9 @@ sl sl jR tA -ii -ii +qu +qu +qu rC ii ii @@ -32057,7 +32078,6 @@ ii ii ii ii -ii "} (105,1,1) = {" ii @@ -32117,10 +32137,10 @@ ii ii ii ii -ii rC -ii -cB +qu +qu +qu Rj Iy Dt @@ -32140,8 +32160,9 @@ CU iM LH tA -ii -ii +qu +qu +qu rC ii ii @@ -32199,7 +32220,6 @@ ii ii ii ii -ii "} (106,1,1) = {" ii @@ -32259,10 +32279,10 @@ ii ii ii ii -ii rC -ii -ii +qu +qu +qu Rj Iy Dt @@ -32282,8 +32302,9 @@ mz ai LH tA -ii -ii +qu +qu +qu rC ii ii @@ -32341,7 +32362,6 @@ ii ii ii ii -ii "} (107,1,1) = {" ii @@ -32401,10 +32421,10 @@ ii ii ii ii -ii rC -ii -ii +qu +qu +qu Rj kF Dt @@ -32424,13 +32444,13 @@ CU ai Ip tA -ii -ii +qu +qu +qu rC ii ii ii -ii cs ii ii @@ -32543,10 +32563,10 @@ ii ii ii ii -ii rC -ii -ii +qu +qu +qu Rj dD Dt @@ -32566,10 +32586,10 @@ CU ai ai tA -Ed -Ed -Ed -ii +qu +qu +qu +rC ii ii ii @@ -32685,10 +32705,10 @@ ii cs ii ii -ii -rC -Ed Ed +qu +qu +qu Rj dD Dt @@ -32708,10 +32728,10 @@ CU CU ex tA -ii -ii -Ed -ii +qu +qu +qu +rC ii ii ii @@ -32827,8 +32847,8 @@ ii ii ii ii -ii -rC +Ed +Ed ii ii Rj @@ -32853,7 +32873,7 @@ tA ii ii Ed -ii +Ed ii ii ii diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index bbf4f7ebd223..cb7ef4ad7ea6 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -2878,6 +2878,10 @@ }, /turf/simulated/floor/tiled, /area/medical/surgery) +"czd" = ( +/obj/structure/lattice, +/turf/simulated/floor/airless/ceiling, +/area/space) "czx" = ( /obj/machinery/computer/crew{ dir = 4 @@ -6822,6 +6826,10 @@ /obj/landmark/spawnpoint/job/psychiatrist, /turf/simulated/floor/carpet/sblucarpet, /area/medical/psych/psych_1) +"fSH" = ( +/obj/structure/lattice, +/turf/space/basic, +/area/space) "fSY" = ( /obj/machinery/suspension_gen, /obj/machinery/light{ @@ -11964,6 +11972,9 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgeryprep) +"kpL" = ( +/turf/space/basic, +/area/space) "kqo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -12575,6 +12586,12 @@ "kPx" = ( /turf/simulated/floor/tiled, /area/medical/medbay3) +"kPN" = ( +/obj/machinery/camera/network/outside{ + dir = 5 + }, +/turf/simulated/floor/airless/ceiling, +/area/space) "kPU" = ( /obj/structure/bed/chair/office/dark, /obj/effect/floor_decal/borderfloorwhite, @@ -31019,10 +31036,10 @@ gVh gVh gVh gVh -oCz -oCz -oCz -oCz +oHo +oHo +oHo +oHo bdR pYD gVh @@ -31159,12 +31176,12 @@ bdR gVh gVh gVh -oCz -oCz -oCz -oCz -oCz -oCz +oHo +oHo +oHo +oHo +oHo +oHo gVh pYD gVh @@ -31305,8 +31322,8 @@ oHo oHo oHo oHo -oCz -oCz +oHo +oHo gVh bdR gVh @@ -31447,7 +31464,7 @@ unF avV wOy oHo -oCz +oHo eLn iBC bdR @@ -31589,7 +31606,7 @@ cOK qYA wRJ oHo -oCz +oHo gVh gVh bdR @@ -31731,7 +31748,7 @@ bUe iRW mDs oHo -oCz +oHo gVh gVh pYD @@ -38976,7 +38993,7 @@ sCe sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -39260,7 +39277,7 @@ sCe sCe sCe sCe -gVh +fSH pYD gVh gVh @@ -39402,7 +39419,7 @@ wDA sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -39544,7 +39561,7 @@ sCe sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -39686,7 +39703,7 @@ sCe sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -39828,7 +39845,7 @@ sCe sCe sCe sCe -bdR +fSH pYD gVh gVh @@ -39970,7 +39987,7 @@ sCe sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -40112,7 +40129,7 @@ sCe sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -40254,7 +40271,7 @@ sCe sCe sCe sCe -gVh +kpL pYD gVh gVh @@ -40396,7 +40413,7 @@ sCe sCe sCe sCe -gVh +fSH pYD gVh gVh @@ -40534,11 +40551,11 @@ xND ilf xND lUU +sCe +sCe +sCe +sCe gVh -gVh -gVh -bdR -bdR pYD gVh gVh @@ -40676,10 +40693,10 @@ tSA xwQ tSA lUU -dlt -gVh -gVh -bdR +wDA +sCe +sCe +sCe gVh pYD gVh @@ -40822,7 +40839,7 @@ bdR bdR bdR bdR -gVh +bdR bdR gVh gVh @@ -46741,11 +46758,11 @@ bdR gVh eLn ioO -gVh -bdR -gVh -bdR -gVh +sCe +czd +sCe +czd +sCe ioO hKW mhy @@ -46753,11 +46770,11 @@ geq cuU qoo ioO -gVh -gVh -gVh -gVh -gVh +sCe +sCe +sCe +sCe +sCe ioO eLn gVh @@ -46883,11 +46900,11 @@ bdR bdR iBC pYD -bdR -bdR -gVh -bdR -gVh +czd +czd +sCe +czd +sCe ioO fhO mhy @@ -46895,11 +46912,11 @@ xOu cuU oqY ioO -dlt -gVh -gVh -gVh -gVh +wDA +sCe +sCe +sCe +sCe gVh iBC gVh @@ -47027,9 +47044,9 @@ bdR gVh gVh bdR -gVh -bdR -gVh +sCe +czd +sCe ioO gAR gAR @@ -47037,9 +47054,9 @@ gAR gAR gAR ioO -bdR -bdR -bdR +czd +czd +czd pYD pYD pYD @@ -47171,15 +47188,15 @@ gVh bdR gVh bdR -gVh -sHK -gVh -gVh -gVh -gVh -gVh -gVh -gVh +sCe +kPN +sCe +sCe +sCe +sCe +sCe +sCe +sCe bdR gVh gVh @@ -47314,14 +47331,14 @@ bdR gVh bdR gVh -gVh -gVh -gVh -gVh -gVh -gVh -gVh -gVh +sCe +sCe +sCe +sCe +sCe +sCe +sCe +kpL bdR gVh gVh @@ -47454,16 +47471,16 @@ bdR pYD bdR bdR -pYD -pYD -pYD -pYD -pYD -pYD -pYD -pYD -pYD -pYD +fSH +kpL +kpL +sCe +sCe +sCe +sCe +sCe +kpL +fSH bdR bdR bdR @@ -47596,7 +47613,7 @@ gVh gVh gVh gVh -gVh +bdR bdR gVh gVh @@ -47604,8 +47621,8 @@ gVh gVh gVh bdR -gVh -gVh +bdR +bdR bdR gVh gVh diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index 82fd587fbe19..2728d672a382 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -2700,6 +2700,9 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) +"ccp" = ( +/turf/simulated/floor/airless/ceiling, +/area/space) "ccu" = ( /obj/machinery/camera/network/civilian{ dir = 8 @@ -38166,6 +38169,9 @@ dqm vgx xLf oRJ +ccp +ccp +ccp pkc nIK nIK @@ -38202,9 +38208,6 @@ nIK nIK nIK nIK -nIK -nIK -nIK "} (30,1,1) = {" nIK @@ -38308,6 +38311,9 @@ lbX xFn xOh oRJ +ccp +ccp +ccp pkc nIK nIK @@ -38344,9 +38350,6 @@ nIK nIK nIK nIK -nIK -nIK -nIK "} (31,1,1) = {" nIK @@ -38450,11 +38453,11 @@ tzb vgG xRX oRJ +ccp +ccp +ccp +pkc pkc -nIK -nIK -nIK -nIK nIK nIK nIK