diff --git a/icons/misc/title_vr.dmi b/icons/misc/title_vr.dmi index 88b593faa4d..a1512300841 100644 Binary files a/icons/misc/title_vr.dmi and b/icons/misc/title_vr.dmi differ diff --git a/maps/groundbase/gb-mining.dmm b/maps/groundbase/gb-mining.dmm index 4901663407c..da23d5cfbb5 100644 --- a/maps/groundbase/gb-mining.dmm +++ b/maps/groundbase/gb-mining.dmm @@ -6,18 +6,18 @@ /obj/effect/step_trigger/teleporter/from_mining{ pixel_y = -16 }, -/turf/simulated/mineral/floor/cave, +/turf/simulated/mineral/floor/ignore_mapgen, /area/gb_mine/unexplored) "v" = ( /obj/effect/step_trigger/teleporter/from_mining, /turf/simulated/mineral/cave/virgo3c, /area/gb_mine/unexplored) -"G" = ( -/turf/simulated/mineral/floor/cave, -/area/gb_mine/unexplored) "I" = ( /turf/simulated/mineral/cave/virgo3c, /area/gb_mine/unexplored) +"Z" = ( +/turf/simulated/mineral/floor/ignore_mapgen, +/area/gb_mine/unexplored) (1,1,1) = {" a @@ -1984,7 +1984,7 @@ I I I I -I +Z I I I @@ -2125,9 +2125,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -2266,9 +2266,9 @@ I I I I -I -G -G +Z +Z +Z o I I @@ -2408,9 +2408,9 @@ I I I I -I -G -G +Z +Z +Z o I I @@ -2551,9 +2551,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -2635,11 +2635,10 @@ I I I I -G -G -G -G -I +Z +Z +Z +Z I I I @@ -2695,6 +2694,7 @@ I I I I +Z I I I @@ -2772,20 +2772,20 @@ I I I I -G -G +Z +Z I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I -G -G +Z +Z I I I @@ -2911,23 +2911,23 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I -G -G -G +Z +Z +Z I I I @@ -3049,29 +3049,29 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I -G +Z I I I @@ -3190,33 +3190,33 @@ I I I I -G -G -G +Z +Z +Z I -G +Z I -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I -G -G -G -G +Z +Z +Z +Z I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -3327,43 +3327,43 @@ I I I I -G +Z I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I -G -G +Z +Z I -G -G -G +Z +Z +Z I I I -G -G -G -G +Z +Z +Z +Z I -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -3413,8 +3413,8 @@ I I I I -G -G +Z +Z I I I @@ -3467,17 +3467,17 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -3489,23 +3489,23 @@ I I I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -3555,8 +3555,8 @@ I I I I -G -G +Z +Z I I I @@ -3609,14 +3609,14 @@ I I I I -G -G +Z +Z I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -3633,21 +3633,21 @@ I I I I -G -G -G +Z +Z +Z I -G +Z I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -3696,8 +3696,8 @@ I I I I -G -G +Z +Z I I I @@ -3750,12 +3750,12 @@ I I I I -G -G -G +Z +Z +Z I -G -G +Z +Z I I I @@ -3781,17 +3781,17 @@ I I I I -G +Z I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I -G +Z I I I @@ -3839,7 +3839,7 @@ I I I I -G +Z I I I @@ -3891,11 +3891,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -3926,16 +3926,16 @@ I I I I -G -G -G +Z +Z +Z I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -3979,9 +3979,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4032,9 +4032,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4067,17 +4067,17 @@ I I I I -G -G +Z +Z I -G -G -G +Z +Z +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -4121,9 +4121,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4173,11 +4173,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -4209,16 +4209,16 @@ I I I I -G +Z I -G -G -G +Z +Z +Z I -G +Z I -G -G +Z +Z I I I @@ -4262,9 +4262,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4314,10 +4314,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -4352,17 +4352,17 @@ I I I I -G -G +Z +Z I -G -G -G -G +Z +Z +Z +Z I I -G -G +Z +Z I I I @@ -4404,8 +4404,8 @@ I I I I -G -G +Z +Z I I I @@ -4455,9 +4455,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4498,14 +4498,14 @@ I I I I -G +Z I -G -G -G +Z +Z +Z I -G -G +Z +Z I I I @@ -4546,8 +4546,8 @@ I I I I -G -G +Z +Z I I I @@ -4596,9 +4596,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4642,17 +4642,17 @@ I I I I -G +Z I I -G -G -G -G -G +Z +Z +Z +Z +Z I I -G +Z I I I @@ -4687,9 +4687,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -4737,10 +4737,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -4786,14 +4786,14 @@ I I I I -G +Z I -G +Z I -G +Z I -G -G +Z +Z I I I @@ -4829,8 +4829,8 @@ I I I I -G -G +Z +Z I I I @@ -4879,8 +4879,8 @@ I I I I -G -G +Z +Z I I I @@ -4929,14 +4929,14 @@ I I I I -G -G +Z +Z I -G -G +Z +Z I -G -G +Z +Z I I I @@ -4968,11 +4968,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -5020,9 +5020,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -5072,13 +5072,13 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -5110,10 +5110,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -5162,8 +5162,8 @@ I I I I -G -G +Z +Z I I I @@ -5214,13 +5214,13 @@ I I I I -G -G +Z +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -5246,14 +5246,14 @@ I I I I -G +Z I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -5303,8 +5303,8 @@ I I I I -G -G +Z +Z I I I @@ -5337,6 +5337,7 @@ I I I I +Z I I I @@ -5356,13 +5357,13 @@ I I I I +Z +Z +Z +Z +Z +Z I -G -G -G -G -G -G I I I @@ -5387,14 +5388,13 @@ I I I I +Z I -G -I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -5444,8 +5444,8 @@ I I I I -G -G +Z +Z I I I @@ -5478,9 +5478,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -5499,12 +5499,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -5528,13 +5528,13 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -5586,8 +5586,8 @@ I I I I -G -G +Z +Z I I I @@ -5619,9 +5619,9 @@ I I I I -I -G -G +Z +Z +Z o I I @@ -5642,12 +5642,12 @@ I I I I -G +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -5669,13 +5669,13 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I -G +Z I I I @@ -5727,9 +5727,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -5761,9 +5761,9 @@ I I I I -I -G -G +Z +Z +Z o I I @@ -5783,14 +5783,14 @@ I I I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -5810,14 +5810,14 @@ I I I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -5869,7 +5869,7 @@ I I I I -G +Z I I I @@ -5904,9 +5904,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -5925,14 +5925,14 @@ I I I I -G -G -G -G +Z +Z +Z +Z I -G +Z I -G +Z I I I @@ -5952,12 +5952,12 @@ I I I I -G -G +Z +Z I I I -G +Z I I I @@ -6010,8 +6010,8 @@ I I I I -G -G +Z +Z I I I @@ -6047,6 +6047,7 @@ I I I I +Z I I I @@ -6067,15 +6068,15 @@ I I I I +Z +Z +Z +Z +Z +Z I -G -G -G -G -G -G +Z I -G I I I @@ -6092,9 +6093,8 @@ I I I I -I -G -G +Z +Z I I I @@ -6152,8 +6152,8 @@ I I I I -G -G +Z +Z I I I @@ -6211,12 +6211,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -6234,9 +6234,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -6293,9 +6293,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -6352,12 +6352,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -6376,9 +6376,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -6435,9 +6435,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -6496,11 +6496,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -6517,9 +6517,9 @@ I I I I -G +Z I -G +Z I I I @@ -6577,8 +6577,8 @@ I I I I -G -G +Z +Z I I I @@ -6639,10 +6639,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -6657,10 +6657,10 @@ I I I I -G -G +Z +Z I -G +Z I I I @@ -6719,9 +6719,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -6779,13 +6779,13 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I -G +Z I I I @@ -6799,8 +6799,8 @@ I I I I -G -G +Z +Z I I I @@ -6860,9 +6860,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -6922,12 +6922,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -6939,9 +6939,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -7002,8 +7002,8 @@ I I I I -G -G +Z +Z I I I @@ -7063,13 +7063,13 @@ I I I I -G -G +Z +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -7079,10 +7079,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -7144,9 +7144,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -7206,11 +7206,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -7220,9 +7220,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -7286,10 +7286,10 @@ I I I I -G -G +Z +Z I -G +Z I I I @@ -7349,22 +7349,22 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -7430,7 +7430,7 @@ I I I I -G +Z I I I @@ -7490,22 +7490,22 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -7570,8 +7570,8 @@ I I I I -G -G +Z +Z I I I @@ -7632,20 +7632,20 @@ I I I I -G -G -G +Z +Z +Z I I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -7710,11 +7710,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -7781,10 +7781,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -7852,9 +7852,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -7923,10 +7923,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -7994,10 +7994,10 @@ I I I I -G +Z I -G -G +Z +Z I I I @@ -8063,15 +8063,15 @@ I I I I -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -8135,10 +8135,10 @@ I I I I -G -G +Z +Z I -G +Z I I I @@ -8206,17 +8206,17 @@ I I I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I -G +Z I I I @@ -8277,9 +8277,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -8347,19 +8347,19 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -8419,8 +8419,8 @@ I I I I -G -G +Z +Z I I I @@ -8491,16 +8491,16 @@ I I I I -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -8561,7 +8561,7 @@ I I I I -G +Z I I I @@ -8635,13 +8635,13 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -8703,7 +8703,7 @@ I I I I -G +Z I I I @@ -8777,12 +8777,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -8921,8 +8921,8 @@ I I I I -G -G +Z +Z I I I @@ -9061,9 +9061,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -9201,10 +9201,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -9342,7 +9342,7 @@ I I I I -G +Z I I I @@ -9482,8 +9482,8 @@ I I I I -G -G +Z +Z I I I @@ -9621,11 +9621,11 @@ I I I I -G +Z I -G -G -G +Z +Z +Z I I I @@ -9762,10 +9762,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -9901,10 +9901,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -10040,11 +10040,11 @@ I I I I -G +Z I -G -G -G +Z +Z +Z I I I @@ -10178,14 +10178,14 @@ I I I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -10254,6 +10254,7 @@ I I I I +Z I I I @@ -10316,15 +10317,14 @@ I I I I +Z +Z +Z +Z +Z I -G -G -G -G -G -I -G -G +Z +Z I I I @@ -10395,9 +10395,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -10457,12 +10457,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -10536,9 +10536,9 @@ I I I I -I -G -G +Z +Z +Z o I I @@ -10594,13 +10594,13 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -10678,9 +10678,9 @@ I I I I -I -G -G +Z +Z +Z o I I @@ -10734,12 +10734,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -10821,9 +10821,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -10874,13 +10874,13 @@ I I I I -G -G -G +Z +Z +Z I -G +Z I -G +Z I I I @@ -10964,6 +10964,7 @@ I I I I +Z I I I @@ -11014,10 +11015,9 @@ I I I I -I -G -G -G +Z +Z +Z I I I @@ -11154,11 +11154,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -11294,11 +11294,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -11433,13 +11433,13 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -11575,12 +11575,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -11717,12 +11717,12 @@ I I I I -G -G +Z +Z I -G -G -G +Z +Z +Z I I I @@ -11862,8 +11862,8 @@ I I I I -G -G +Z +Z I I I @@ -12002,11 +12002,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -12145,10 +12145,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -12286,10 +12286,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -12428,8 +12428,8 @@ I I I I -G -G +Z +Z I I I @@ -12570,8 +12570,8 @@ I I I I -G -G +Z +Z I I I @@ -12611,8 +12611,8 @@ I I I I -G -G +Z +Z I I I @@ -12711,10 +12711,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -12748,14 +12748,14 @@ I I I I -G +Z I I -G +Z I -G +Z I -G +Z I I I @@ -12853,9 +12853,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -12890,19 +12890,19 @@ I I I I -G +Z I I -G +Z I -G -G -G -G -G +Z +Z +Z +Z +Z I -G -G +Z +Z I I I @@ -12994,9 +12994,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -13029,27 +13029,27 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I -G +Z I -G -G -G +Z +Z +Z I I I @@ -13136,8 +13136,8 @@ I I I I -G -G +Z +Z I I I @@ -13170,28 +13170,28 @@ I I I I -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z I -G -G -G +Z +Z +Z I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -13276,11 +13276,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -13312,27 +13312,27 @@ I I I I -G -G +Z +Z I -G -G +Z +Z I I I I -G +Z I -G +Z I -G +Z I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -13417,11 +13417,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -13453,30 +13453,30 @@ I I I I -G -G -G -G +Z +Z +Z +Z I -G +Z I I I -G +Z I I I -G +Z I -G -G -G +Z +Z +Z I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -13558,10 +13558,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -13592,13 +13592,13 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -13608,17 +13608,17 @@ I I I I -G -G +Z +Z I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -13699,9 +13699,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -13732,14 +13732,14 @@ I I I I -G +Z I -G +Z I -G +Z I -G -G +Z +Z I I I @@ -13755,12 +13755,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -13840,10 +13840,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -13871,14 +13871,14 @@ I I I I -G +Z I -G -G -G +Z +Z +Z I -G -G +Z +Z I I I @@ -13897,12 +13897,12 @@ I I I I -G +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -13982,9 +13982,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14005,20 +14005,20 @@ I I I I -G -G +Z +Z I I I I -G -G -G +Z +Z +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -14040,11 +14040,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -14123,9 +14123,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14146,22 +14146,22 @@ I I I I -G -G +Z +Z I -G +Z I I -G -G -G +Z +Z +Z I -G +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -14184,9 +14184,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14264,9 +14264,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14288,20 +14288,20 @@ I I I I -G -G -G -G +Z +Z +Z +Z I -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -14325,11 +14325,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -14406,9 +14406,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14429,21 +14429,21 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I -G +Z I I I @@ -14468,9 +14468,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14547,8 +14547,8 @@ I I I I -G -G +Z +Z I I I @@ -14572,19 +14572,19 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I -G +Z I -G +Z I I I -G +Z I I I @@ -14609,11 +14609,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -14678,8 +14678,8 @@ I I I I -G -G +Z +Z I I I @@ -14689,7 +14689,7 @@ I I I I -G +Z I I I @@ -14713,9 +14713,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14751,11 +14751,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -14819,9 +14819,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -14830,8 +14830,8 @@ I I I I -G -G +Z +Z I I I @@ -14855,8 +14855,8 @@ I I I I -G -G +Z +Z I I I @@ -14893,10 +14893,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -14958,21 +14958,21 @@ I I I I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I I I I -G -G +Z +Z I I I @@ -14997,9 +14997,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -15034,10 +15034,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -15099,22 +15099,22 @@ I I I I -G -G -G +Z +Z +Z I I I -G -G +Z +Z I I I I I -G -G -G +Z +Z +Z I I I @@ -15139,9 +15139,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -15176,10 +15176,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -15239,23 +15239,23 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I -G -G -G +Z +Z +Z I I I @@ -15282,7 +15282,7 @@ I I I I -G +Z I I I @@ -15319,9 +15319,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -15379,25 +15379,25 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I -G -G -G +Z +Z +Z I I I @@ -15423,9 +15423,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -15461,8 +15461,8 @@ I I I I -G -G +Z +Z I I I @@ -15520,25 +15520,25 @@ I I I I -G -G -G +Z +Z +Z I -G -G +Z +Z I I I I I -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -15566,8 +15566,8 @@ I I I I -G -G +Z +Z I I I @@ -15602,9 +15602,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -15662,8 +15662,8 @@ I I I I -G -G +Z +Z I I I @@ -15674,10 +15674,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -15708,11 +15708,11 @@ I I I I -G -G +Z +Z I -G -G +Z +Z I I I @@ -15744,9 +15744,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -15804,8 +15804,8 @@ I I I I -G -G +Z +Z I I I @@ -15819,7 +15819,7 @@ I I I I -G +Z I I I @@ -15851,10 +15851,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -15885,14 +15885,14 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I -G +Z I I I @@ -15945,8 +15945,8 @@ I I I I -G -G +Z +Z I I I @@ -15993,10 +15993,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -16028,19 +16028,19 @@ I I I I -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z I -G +Z I -G +Z I I I @@ -16087,7 +16087,7 @@ I I I I -G +Z I I I @@ -16135,10 +16135,10 @@ I I I I -G -G -G -G +Z +Z +Z +Z I I I @@ -16170,20 +16170,20 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -16277,13 +16277,13 @@ I I I I -G -G -G -G +Z +Z +Z +Z I -G -G +Z +Z I I I @@ -16313,21 +16313,21 @@ I I I I -G -G +Z +Z I -G -G -G -G +Z +Z +Z +Z I -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z I I I @@ -16420,12 +16420,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -16455,22 +16455,22 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I I I @@ -16564,9 +16564,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -16598,22 +16598,22 @@ I I I I -G -G -G -G -G -G -G -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z +Z I -G -G +Z +Z I I I @@ -16707,8 +16707,8 @@ I I I I -G -G +Z +Z I I I @@ -16742,20 +16742,20 @@ I I I I -G +Z I -G -G -G +Z +Z +Z I -G -G +Z +Z I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -16894,12 +16894,12 @@ I I I I -G -G -G -G -G -G +Z +Z +Z +Z +Z +Z I I I @@ -17036,12 +17036,12 @@ I I I I -G +Z I -G -G -G -G +Z +Z +Z +Z I I I @@ -17179,12 +17179,12 @@ I I I I -G -G +Z +Z I -G -G -G +Z +Z +Z I I I @@ -17287,6 +17287,7 @@ I I I I +Z I I I @@ -17322,11 +17323,10 @@ I I I I -I -G -G -G -G +Z +Z +Z +Z I I I @@ -17428,9 +17428,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -17466,11 +17466,11 @@ I I I I -G -G -G -G -G +Z +Z +Z +Z +Z I I I @@ -17569,10 +17569,10 @@ I I I I -I -G -G -G +Z +Z +Z +Z v I I @@ -17711,10 +17711,10 @@ I I I I -I -G -G -G +Z +Z +Z +Z v I I @@ -17854,9 +17854,9 @@ I I I I -G -G -G +Z +Z +Z I I I @@ -17997,7 +17997,7 @@ I I I I -I +Z I I I diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index b4ea52d99ac..f43b6225bee 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -153,7 +153,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "az" = ( /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/dark, @@ -267,6 +267,9 @@ /obj/machinery/camera/network/engineering{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "aO" = ( @@ -993,7 +996,7 @@ req_access = list(16) }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "de" = ( /obj/machinery/cryopod/robot/door/gateway, /obj/effect/floor_decal/techfloor/orange{ @@ -1320,7 +1323,7 @@ icon_state = "4-8" }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "ed" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -1826,7 +1829,7 @@ dir = 5 }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "fG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2129,7 +2132,7 @@ }, /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "gv" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/hos) @@ -2357,7 +2360,7 @@ "hd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "he" = ( /obj/machinery/newscaster{ layer = 3.3; @@ -2481,7 +2484,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -3245,7 +3248,7 @@ "jK" = ( /obj/machinery/alarm, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "jL" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -3340,7 +3343,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "ka" = ( /obj/machinery/alarm{ dir = 4 @@ -3793,7 +3796,7 @@ icon_state = "2-8" }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "lk" = ( /obj/structure/table/steel, /obj/item/weapon/tool/crowbar, @@ -4233,7 +4236,7 @@ icon_state = "1-2" }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "mD" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -4246,6 +4249,12 @@ }, /turf/simulated/floor, /area/groundbase/engineering/lobby) +"mE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/atmos/monitoring) "mF" = ( /obj/effect/landmark{ name = "lightsout" @@ -4308,7 +4317,7 @@ "mN" = ( /obj/machinery/media/jukebox/hacked, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "mO" = ( /obj/machinery/vending/snack, /turf/simulated/floor/tiled/dark, @@ -4498,6 +4507,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) "no" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "nq" = ( @@ -4563,6 +4573,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/atmos/monitoring) "nx" = ( @@ -5167,6 +5179,7 @@ "ps" = ( /obj/machinery/computer/station_alert, /obj/machinery/firealarm, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "pt" = ( @@ -5295,7 +5308,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "pM" = ( /turf/simulated/floor, /area/maintenance/groundbase/substation/medcargo) @@ -5450,7 +5463,7 @@ /area/groundbase/security/lobby) "ql" = ( /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "qm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -6245,7 +6258,7 @@ "sv" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "sw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -6710,7 +6723,7 @@ icon_state = "1-2" }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "tN" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, @@ -7326,7 +7339,7 @@ /obj/machinery/power/apc, /obj/structure/cable/yellow, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "vE" = ( /obj/machinery/computer/arcade/orion_trail{ dir = 8 @@ -7393,6 +7406,7 @@ /area/groundbase/security/detective) "vS" = ( /obj/machinery/vending/wardrobe/atmosdrobe, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "vT" = ( @@ -7414,6 +7428,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"vX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/halle) "wa" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -7469,7 +7495,7 @@ "wg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "wh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/highsecurity{ @@ -7535,6 +7561,7 @@ dir = 4; pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "wv" = ( @@ -8068,7 +8095,7 @@ dir = 10 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "xJ" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, @@ -8259,6 +8286,9 @@ /area/maintenance/groundbase/substation/secsci) "yq" = ( /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "yr" = ( @@ -8319,7 +8349,7 @@ }, /obj/effect/landmark/start/ai, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "yx" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8366,7 +8396,7 @@ /area/groundbase/engineering/atmos) "yG" = ( /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "yH" = ( /obj/machinery/atmospherics/binary/pump/high_power/on{ dir = 1 @@ -8525,7 +8555,7 @@ dir = 10 }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "ze" = ( /obj/machinery/cryopod{ dir = 2 @@ -8644,7 +8674,7 @@ "zr" = ( /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "zs" = ( /obj/machinery/conveyor{ id = "recycling" @@ -8934,9 +8964,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "Ah" = ( @@ -10457,7 +10485,7 @@ dir = 8 }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "EQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10499,7 +10527,7 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "EU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -10547,7 +10575,7 @@ output_level = 200000 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Fb" = ( /obj/structure/table/rack{ dir = 8; @@ -11134,7 +11162,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Hb" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -11681,7 +11709,7 @@ "IB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "IC" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/freeform, @@ -11827,7 +11855,7 @@ "Jg" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Jh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11900,7 +11928,8 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "Js" = ( @@ -11987,7 +12016,7 @@ /area/maintenance/groundbase/level1/stunnel) "JI" = ( /turf/simulated/wall/durasteel, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "JJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -12542,7 +12571,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Lh" = ( /obj/machinery/firealarm{ dir = 4 @@ -12613,6 +12642,18 @@ "Lt" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level1/se) +"Lu" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/halle) "Lv" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -12730,6 +12771,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "LK" = ( @@ -12763,6 +12810,13 @@ outdoors = 0 }, /area/groundbase/command/ai/foyer) +"LQ" = ( +/obj/effect/floor_decal/industrial/danger, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/atmos) "LR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -13352,7 +13406,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "NC" = ( /obj/structure/cable{ icon_state = "1-4" @@ -13366,7 +13420,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "NE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13847,6 +13901,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) +"Pf" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/halle) "Ph" = ( /obj/structure/cable{ icon_state = "0-4" @@ -13911,7 +13971,7 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "PB" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /turf/simulated/floor/tiled/techmaint, @@ -14109,7 +14169,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Qb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15018,7 +15078,7 @@ pixel_y = -24 }, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "SU" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 9 @@ -15206,6 +15266,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or2) +"Tv" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/halle) "Tw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15507,7 +15574,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Us" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -15903,7 +15970,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "VO" = ( /obj/machinery/requests_console{ department = "Medical"; @@ -16743,7 +16810,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Yp" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -17066,7 +17133,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "Zh" = ( /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) @@ -17212,7 +17279,7 @@ "ZM" = ( /obj/machinery/porta_turret/ai_defense, /turf/simulated/floor/bluegrid, -/area/groundbase/command/ai) +/area/groundbase/command/ai/chamber) "ZN" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -19861,10 +19928,10 @@ lC ZY Wa Pm -ms -XN -XN -XN +qD +qD +qD +qD qD qD qD @@ -24766,8 +24833,8 @@ SW gz hO gv -pn -fH +Lu +Tv ma rT rT @@ -25334,8 +25401,8 @@ yb yb yb yb -pn -vd +vX +Pf ma AZ AZ @@ -32561,7 +32628,7 @@ aM iS RC hA -FK +LQ cL zx RW @@ -32983,7 +33050,7 @@ Lt iS ps no -no +mE PF nr Jx diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 83dfa7e5e5f..97546c903a7 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -21,9 +21,7 @@ /datum/map/groundbase/New() ..() var/choice = pickweight(list( - "logo1" = 50, - "logo2" = 50, - "gateway" = 5 + "endo" )) if(choice) lobby_screens = list(choice) @@ -42,7 +40,7 @@ zlevel_datum_type = /datum/map_z_level/groundbase lobby_icon = 'icons/misc/title_vr.dmi' - lobby_screens = list("logo1") + lobby_screens = list("endo") id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' @@ -140,6 +138,11 @@ /area/groundbase/level3/nw, /area/groundbase/level3/se, /area/groundbase/level3/sw, + /area/maintenance/groundbase/level1/netunnel, + /area/maintenance/groundbase/level1/nwtunnel, + /area/maintenance/groundbase/level1/setunnel, + /area/maintenance/groundbase/level1/stunnel, + /area/maintenance/groundbase/level1/swtunnel, /area/groundbase/science/picnic, /area/groundbase/medical/patio, /area/groundbase/civilian/hydroponics/out @@ -441,11 +444,8 @@ /obj/effect/step_trigger/teleporter/to_mining/Initialize() . = ..() teleport_x = x - teleport_y = y - for(var/z_num in using_map.zlevels) - var/datum/map_z_level/Z = using_map.zlevels[z_num] - if(Z.name == "V3c Underground") - teleport_z = Z.z + teleport_y = y + 1 + teleport_z = Z_LEVEL_MINING /obj/effect/step_trigger/teleporter/from_mining icon = 'icons/obj/structures/stairs_64x64.dmi' @@ -454,8 +454,5 @@ /obj/effect/step_trigger/teleporter/from_mining/Initialize() . = ..() teleport_x = x - teleport_y = y - for(var/z_num in using_map.zlevels) - var/datum/map_z_level/Z = using_map.zlevels[z_num] - if(Z.name == "Level 1") - teleport_z = Z.z + teleport_y = y - 1 + teleport_z = Z_LEVEL_GB_BOTTOM