From b6422ee753ca8bb46dcd871d17273c3c345e2057 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 2 Apr 2022 07:54:02 -0400 Subject: [PATCH 1/2] Normal Map Tweaks More forgotten stuff, some fixes, and some tweaks should make night time bright enough to see in maybe hopefully, and makes it so mining's air isn't messed up. Also fixes the stairs to mining. --- code/modules/planet/virgo3c_vr.dm | 13 +- maps/groundbase/gb-mining.dmm | 271 +++++++++++++------------- maps/groundbase/gb-z1.dmm | 192 ++++++------------ maps/groundbase/gb-z2.dmm | 78 +++++--- maps/groundbase/gb-z3.dmm | 16 +- maps/groundbase/groundbase_areas.dm | 25 ++- maps/groundbase/groundbase_defines.dm | 5 + 7 files changed, 288 insertions(+), 312 deletions(-) diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 9af1591d7b..120efb1e1e 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -54,10 +54,10 @@ var/datum/planet/virgo3c/planet_virgo3c = null switch(sun_position) if(0 to 0.45) // Night - low_brightness = 0.1 + low_brightness = 0.3 low_color = "#000066" - high_brightness = 0.2 + high_brightness = 0.4 high_color = "#66004D" min = 0 @@ -531,7 +531,6 @@ var/datum/planet/virgo3c/planet_virgo3c = null alpha = 0xFF VIRGO3C_SET_ATMOS -VIRGO3C_TURF_CREATE(/turf/simulated/mineral/cave) VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/newdirt) VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/newdirt_nograss) VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/sidewalk) @@ -546,10 +545,18 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/dark) VIRGO3C_TURF_CREATE(/turf/simulated/mineral) VIRGO3C_TURF_CREATE(/turf/simulated/floor) +/turf/simulated/mineral/cave/virgo3c + VIRGO3C_SET_ATMOS + outdoors = 0 + /turf/simulated/mineral/floor/virgo3c VIRGO3C_SET_ATMOS outdoors = 0 +/turf/simulated/mineral/floor/ignore_mapgen/virgo3c + VIRGO3C_SET_ATMOS + outdoors = 0 + /turf/simulated/floor/outdoors/grass/virgo3c VIRGO3C_SET_ATMOS diff --git a/maps/groundbase/gb-mining.dmm b/maps/groundbase/gb-mining.dmm index 1a711a723e..e251feddd1 100644 --- a/maps/groundbase/gb-mining.dmm +++ b/maps/groundbase/gb-mining.dmm @@ -2,19 +2,18 @@ "a" = ( /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/mining/unexplored) -"o" = ( -/obj/effect/step_trigger/teleporter/from_mining{ - pixel_y = -16 - }, -/turf/simulated/mineral/floor/ignore_mapgen, +"b" = ( +/turf/simulated/wall/r_wall, +/area/groundbase/mining/unexplored) +"x" = ( +/obj/effect/step_trigger/teleporter/from_mining, +/turf/simulated/mineral/floor/ignore_mapgen/virgo3c, /area/groundbase/mining/unexplored) "I" = ( -/turf/simulated/mineral/cave/virgo3c{ - outdoors = 0 - }, +/turf/simulated/mineral/cave/virgo3c, /area/groundbase/mining/unexplored) "Z" = ( -/turf/simulated/mineral/floor/ignore_mapgen, +/turf/simulated/mineral/floor/ignore_mapgen/virgo3c, /area/groundbase/mining/unexplored) (1,1,1) = {" @@ -1982,9 +1981,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -2123,12 +2122,12 @@ I I I I +I Z Z -I -I -I -I +b +b +b I I I @@ -2264,13 +2263,13 @@ I I I I -Z -Z -Z -o -Z -I I +Z +Z +Z +x +Z +b I I I @@ -2406,13 +2405,13 @@ I I I I -Z -Z -Z -o -Z -I I +Z +Z +Z +x +Z +b I I I @@ -2549,12 +2548,12 @@ I I I I +I Z Z -I -I -I -I +b +b +b I I I @@ -2692,9 +2691,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -4212,9 +4211,9 @@ I Z Z Z -I Z -I +Z +Z Z Z I @@ -4357,8 +4356,8 @@ Z Z Z Z -I -I +Z +Z Z Z I @@ -4501,7 +4500,7 @@ I Z Z Z -I +Z Z Z I @@ -4642,7 +4641,7 @@ I I Z I -I +Z Z Z Z @@ -4785,7 +4784,7 @@ I I I Z -I +Z Z I Z @@ -5335,9 +5334,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -5476,12 +5475,12 @@ I I I I +I Z Z -I -I -I -I +b +b +b I I I @@ -5617,13 +5616,13 @@ I I I I -Z -Z -Z -o -Z -I I +Z +Z +Z +x +Z +b I I I @@ -5759,13 +5758,13 @@ I I I I -Z -Z -Z -o -Z -I I +Z +Z +Z +x +Z +b I I I @@ -5902,12 +5901,12 @@ I I I I +I Z Z -I -I -I -I +b +b +b I I I @@ -6045,9 +6044,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -6516,7 +6515,7 @@ I I I Z -I +Z Z I I @@ -6657,7 +6656,7 @@ I I Z Z -I +Z Z I I @@ -6799,7 +6798,7 @@ I I Z Z -I +Z I I I @@ -6940,7 +6939,7 @@ I Z Z Z -I +Z I I I @@ -7286,7 +7285,7 @@ I I Z Z -I +Z Z I I @@ -7426,8 +7425,8 @@ I I I I -I -I +Z +Z Z I I @@ -8918,7 +8917,7 @@ I I I I -I +Z Z Z I @@ -9341,7 +9340,7 @@ I I I Z -I +Z I I I @@ -9479,10 +9478,10 @@ I I I I -I Z Z -I +Z +Z I I I @@ -10252,9 +10251,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -10393,12 +10392,12 @@ I I I I +I Z Z -I -I -I -I +b +b +b I I I @@ -10534,13 +10533,13 @@ I I I I -Z -Z -Z -o -Z -I I +Z +Z +Z +x +Z +b I I I @@ -10676,13 +10675,13 @@ I I I I -Z -Z -Z -o -Z -I I +Z +Z +Z +x +Z +b I I I @@ -10819,12 +10818,12 @@ I I I I +I Z Z -I -I -I -I +b +b +b I I I @@ -10962,9 +10961,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -13450,7 +13449,7 @@ I I I I -I +Z Z Z Z @@ -13731,7 +13730,7 @@ I I I Z -I +Z Z I Z @@ -13874,7 +13873,7 @@ I Z Z Z -I +Z Z Z I @@ -17285,9 +17284,9 @@ I I I I -Z -Z -Z +I +I +I I I I @@ -17426,13 +17425,13 @@ I I I I +I +I Z Z -I -I -I -I -I +b +b +b I I I @@ -17567,14 +17566,14 @@ I I I I -Z -Z -Z -o -Z -I I I +Z +Z +Z +x +Z +b I I I @@ -17709,14 +17708,14 @@ I I I I -Z -Z -Z -o -Z -I I I +Z +Z +Z +x +Z +b I I I @@ -17852,13 +17851,13 @@ I I I I +I +I Z Z -I -I -I -I -I +b +b +b I I I @@ -17995,9 +17994,9 @@ I I I I -Z -Z -Z +I +I +I I I I diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 283b9b9f6e..7784ba0014 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -1117,9 +1117,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) -"dh" = ( -/turf/simulated/mineral/floor/cave, -/area/maintenance/groundbase/level1/netunnel) "dj" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/bar_soft/full, @@ -3208,12 +3205,7 @@ /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/northspur) "iY" = ( -/obj/effect/step_trigger/teleporter/to_mining{ - pixel_y = -16 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, +/turf/simulated/mineral/floor/virgo3c, /area/maintenance/groundbase/level1/netunnel) "iZ" = ( /obj/structure/table/rack/shelf/steel, @@ -3242,14 +3234,6 @@ "jd" = ( /turf/simulated/wall, /area/maintenance/groundbase/substation/medcargo) -"je" = ( -/obj/effect/step_trigger/teleporter/to_mining{ - pixel_y = -16 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/nwtunnel) "jf" = ( /obj/structure/table/reinforced, /obj/fiftyspawner/steel, @@ -4819,13 +4803,13 @@ /turf/simulated/floor/carpet/oracarpet, /area/groundbase/engineering/ce) "nk" = ( -/obj/structure/railing{ - dir = 8 +/obj/effect/step_trigger/teleporter/to_mining{ + pixel_y = -32 }, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ outdoors = 0 }, -/area/maintenance/groundbase/level1/swtunnel) +/area/maintenance/groundbase/level1/netunnel) "nl" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -6299,13 +6283,13 @@ /turf/simulated/floor/bmarble, /area/groundbase/civilian/gateway) "rn" = ( -/obj/structure/railing{ - dir = 8 +/obj/effect/step_trigger/teleporter/to_mining{ + pixel_y = -32 }, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ outdoors = 0 }, -/area/maintenance/groundbase/level1/netunnel) +/area/maintenance/groundbase/level1/nwtunnel) "rp" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -6822,7 +6806,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "sM" = ( -/turf/simulated/mineral/floor/cave, +/turf/simulated/mineral/floor/virgo3c, /area/maintenance/groundbase/level1/nwtunnel) "sN" = ( /obj/machinery/door/firedoor, @@ -10010,11 +9994,13 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) "Bq" = ( -/obj/structure/railing, +/obj/effect/step_trigger/teleporter/to_mining{ + pixel_y = -32 + }, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ outdoors = 0 }, -/area/maintenance/groundbase/level1/netunnel) +/area/maintenance/groundbase/level1/swtunnel) "Br" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10208,12 +10194,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) -"BM" = ( -/obj/structure/railing, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/nwtunnel) "BN" = ( /obj/machinery/alarm, /turf/simulated/floor/tiled, @@ -10856,14 +10836,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) -"DH" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/nwtunnel) "DI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11173,14 +11145,6 @@ }, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) -"Ew" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/nwtunnel) "Ex" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/reset, @@ -12662,14 +12626,6 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) -"IO" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/swtunnel) "IQ" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -12885,9 +12841,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) -"Jy" = ( -/turf/simulated/mineral/floor/cave, -/area/maintenance/groundbase/level1/swtunnel) "Jz" = ( /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/civilian/arrivals) @@ -13057,14 +13010,6 @@ /obj/item/weapon/shield/riot, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) -"JV" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/netunnel) "JX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -16891,12 +16836,7 @@ /turf/simulated/floor, /area/maintenance/groundbase/substation/aiciv) "UK" = ( -/obj/effect/step_trigger/teleporter/to_mining{ - pixel_y = -16 - }, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, +/turf/simulated/mineral/floor/virgo3c, /area/maintenance/groundbase/level1/swtunnel) "UL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18126,12 +18066,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) -"Yl" = ( -/obj/structure/railing, -/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ - outdoors = 0 - }, -/area/maintenance/groundbase/level1/swtunnel) "Yn" = ( /obj/effect/landmark/start{ name = "Psychiatrist" @@ -20835,8 +20769,8 @@ AZ AZ AZ AZ -dM -IO +Qq +Qq Qq Qq dM @@ -20977,10 +20911,10 @@ AZ AZ AZ AZ -Yl -Jy +Qq UK -dM +UK +Bq dM PC dM @@ -21119,10 +21053,10 @@ AZ AZ AZ AZ -Yl -Jy +Qq UK -dM +UK +Bq dM PC dM @@ -21261,8 +21195,8 @@ AZ AZ AZ AZ -dM -nk +Qq +Qq Qq Qq dM @@ -24188,10 +24122,10 @@ MO MO MO MO -FF -DH xh -FF +xh +xh +xh Jh FF co @@ -24330,10 +24264,10 @@ MO MO MO MO -BM +xh sM -je -FF +sM +rn Jh FF EK @@ -24472,10 +24406,10 @@ MO MO MO MO -BM +xh sM -je -FF +sM +rn Ht jU oJ @@ -24614,10 +24548,10 @@ MO MO MO MO -FF -Ew xh -FF +xh +xh +xh FF FF Jh @@ -27027,7 +26961,7 @@ lE kr hb uQ -XS +gO wV XS pT @@ -27311,7 +27245,7 @@ lE bD vw aJ -XS +nR wV XS Nc @@ -29105,10 +29039,10 @@ qE qE qE qE -pU -JV iH -pU +iH +iH +iH Ro sF sF @@ -29247,10 +29181,10 @@ qE qE qE qE -Bq -dh +iH iY -pU +iY +nk Ro sF sF @@ -29389,10 +29323,10 @@ qE qE qE qE -Bq -dh +iH iY -pU +iY +nk Ro sF pU @@ -29531,10 +29465,10 @@ qE qE qE qE -pU -rn iH -pU +iH +iH +iH Ro pU pU @@ -36139,10 +36073,10 @@ Lt Lt Lt Lt -FF -DH xh -FF +xh +xh +xh VL jF jF @@ -36281,10 +36215,10 @@ Lt Lt Lt Lt -BM +xh sM -je -FF +sM +rn zf vj vj @@ -36423,10 +36357,10 @@ Lt Lt Lt Lt -BM +xh sM -je -FF +sM +rn zf vj Lt @@ -36565,10 +36499,10 @@ Lt Lt Lt Lt -FF -Ew xh -FF +xh +xh +xh zf Lt Lt @@ -37391,7 +37325,7 @@ uH uH qE Lb -uH +Lb qE qE qE @@ -37675,7 +37609,7 @@ uH Lb Lb qE -uH +Lb sV qE sV diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 6648e368b6..86a082f6cf 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -702,7 +702,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "ce" = ( -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/nw) "cf" = ( /obj/structure/table/woodentable, @@ -1206,7 +1206,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/sw) "dL" = ( /obj/structure/table/woodentable, @@ -1557,7 +1557,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "eN" = ( -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/sw) "eO" = ( /obj/structure/table/woodentable, @@ -2107,6 +2107,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) +"gC" = ( +/obj/structure/bed/chair/sofa/bench{ + dir = 1 + }, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/level2/se) "gE" = ( /turf/simulated/floor/tiled/dark, /area/groundbase/command/tcomms) @@ -4561,11 +4567,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/cargo/qm) -"ou" = ( -/obj/structure/table/woodentable, -/obj/structure/table/woodentable, -/turf/simulated/floor/carpet, -/area/groundbase/civilian/library) "ov" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, @@ -4698,7 +4699,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/nw) "oS" = ( /obj/structure/cable/yellow{ @@ -5738,6 +5739,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +"sr" = ( +/obj/structure/bed/chair/sofa/bench/right{ + dir = 1 + }, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/level2/se) "ss" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -6062,6 +6069,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) +"tA" = ( +/obj/structure/bed/chair/sofa/bench/left{ + dir = 1 + }, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/level2/se) "tB" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -8275,7 +8288,7 @@ /obj/structure/railing/grey{ dir = 1 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/se) "AK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -8690,7 +8703,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/ne) "BX" = ( /obj/structure/disposalpipe/segment{ @@ -8713,7 +8726,7 @@ /obj/structure/railing/grey{ dir = 1 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/nw) "Ca" = ( /obj/structure/cable/yellow{ @@ -9982,7 +9995,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/sw) "FT" = ( /obj/effect/landmark{ @@ -10822,7 +10835,7 @@ /area/groundbase/science/xenobot) "Is" = ( /obj/structure/railing/grey, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/se) "It" = ( /obj/structure/disposalpipe/segment{ @@ -12925,7 +12938,7 @@ /area/groundbase/civilian/hydroponics) "Oy" = ( /obj/structure/railing/grey, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/ne) "Oz" = ( /obj/structure/sink/kitchen{ @@ -13245,7 +13258,8 @@ dir = 8 }, /turf/simulated/floor/tiled/virgo3c{ - edge_blending_priority = -1 + edge_blending_priority = -1; + outdoors = 0 }, /area/groundbase/level2/nw) "PA" = ( @@ -15085,7 +15099,7 @@ /obj/machinery/light/bigfloorlamp, /obj/machinery/light/small, /turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/medical/Chemistry) "Vb" = ( /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) @@ -15185,7 +15199,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "Vs" = ( -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/se) "Vt" = ( /obj/structure/cable/yellow{ @@ -15318,7 +15332,7 @@ /obj/structure/railing/grey{ dir = 1 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/ne) "VQ" = ( /obj/structure/cable/yellow{ @@ -15330,7 +15344,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) "VR" = ( -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/ne) "VS" = ( /obj/structure/table/woodentable, @@ -15448,7 +15462,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/ne) "We" = ( /obj/machinery/light{ @@ -15706,7 +15720,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/level2/nw) "WY" = ( /obj/effect/landmark/start/botanist, @@ -21290,7 +21304,7 @@ rb CC rP Ak -ou +Ak cX iE WA @@ -34524,9 +34538,9 @@ Vs Vs Bo Bo -Bo -Bo -Bo +At +At +At Bo Bo Bo @@ -34667,7 +34681,7 @@ Vs Vs Bo Bo -Bo +At Bo Bo Bo @@ -34809,8 +34823,8 @@ Vs Vs Bo Bo -Bo -Bo +At +tA Bo UE UE @@ -34951,8 +34965,8 @@ Vs Vs Vs Bo -Bo -Bo +At +gC UE UE UE @@ -35094,7 +35108,7 @@ Vs Vs Bo Bo -UE +sr UE UE UE diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 08388b3c35..8557da70cb 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -346,7 +346,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/cargo/office) "hN" = ( /obj/structure/table/bench/marble, @@ -608,7 +608,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/open/virgo3c, +/turf/simulated/open, /area/groundbase/medical/uhallway) "nr" = ( /obj/machinery/button/remote/airlock{ @@ -666,7 +666,7 @@ /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "nZ" = ( -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/cargo/office) "og" = ( /obj/machinery/suit_cycler/medical, @@ -1357,7 +1357,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open/virgo3c, +/turf/simulated/open, /area/groundbase/medical/uhallway) "Ef" = ( /obj/effect/landmark/start{ @@ -1537,7 +1537,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/open/virgo3c, +/turf/simulated/open, /area/groundbase/medical/uhallway) "Gn" = ( /obj/effect/floor_decal/industrial/warning{ @@ -1972,7 +1972,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/cargo/office) "PH" = ( /turf/simulated/wall/rshull, @@ -2081,7 +2081,7 @@ /area/groundbase/exploration/equipment) "RY" = ( /obj/structure/railing/grey, -/turf/simulated/open, +/turf/simulated/open/virgo3c, /area/groundbase/cargo/office) "Sa" = ( /obj/structure/closet/secure_closet/personal/patient, @@ -2302,7 +2302,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/open/virgo3c, +/turf/simulated/open, /area/groundbase/medical/uhallway) "VU" = ( /obj/structure/bed/chair/office/light{ diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 45cf024817..aa352a021b 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -4,7 +4,7 @@ icon_state = "blublacir" requires_power = TRUE dynamic_lighting = TRUE - ambience = AMBIENCE_MAINTENANCE + ambience = AMBIENCE_RUINS base_turf = /turf/simulated/mineral/floor/virgo3c /area/maintenance/groundbase @@ -12,7 +12,7 @@ icon = 'icons/turf/areas_vr.dmi' icon_state = "purblasqu" flags = RAD_SHIELDED - ambience = AMBIENCE_MAINTENANCE + ambience = AMBIENCE_RUINS flags = AREA_FLAG_IS_NOT_PERSISTENT base_turf = /turf/simulated/mineral/floor/virgo3c @@ -75,6 +75,7 @@ name = "Science" holomap_color = HOLOMAP_AREACOLOR_SCIENCE icon_state = "purwhisqu" + ambience = AMBIENCE_GENERIC /area/groundbase/science/hall name = "Science Hallway" /area/groundbase/science/rnd @@ -100,6 +101,7 @@ name = "Command" holomap_color = HOLOMAP_AREACOLOR_COMMAND icon_state = "bluwhisqu" + ambience = AMBIENCE_GENERIC /area/groundbase/command/bridge name = "Bridge" /area/groundbase/command/captain @@ -114,6 +116,7 @@ name = "Command Meeting Room" /area/groundbase/command/ai name = "AI Core" + ambience = AMBIENCE_AI /area/groundbase/command/ai/chamber name = "AI Chamber" /area/groundbase/command/ai/upload @@ -131,6 +134,7 @@ name = "Security" holomap_color = HOLOMAP_AREACOLOR_SECURITY icon_state = "redwhisqu" + ambience = AMBIENCE_GENERIC /area/groundbase/security/lobby name = "Security Lobby" /area/groundbase/security/processing @@ -143,10 +147,12 @@ name = "Warden's Office" /area/groundbase/security/armory name = "Security Armory" + ambience = AMBIENCE_HIGHSEC /area/groundbase/security/briefing name = "Security Briefing Room" /area/groundbase/security/equipment name = "Security Equipment Room" + ambience = AMBIENCE_HIGHSEC /area/groundbase/security/iaa1 name = "Internal Affairs West Office" /area/groundbase/security/iaa2 @@ -208,6 +214,7 @@ name = "Engineering" holomap_color = HOLOMAP_AREACOLOR_ENGINEERING icon_state = "yelwhisqu" + ambience = AMBIENCE_ENGINEERING /area/groundbase/engineering/lobby name = "Engineering Lobby" /area/groundbase/engineering/ce @@ -224,6 +231,7 @@ name = "Engine" /area/groundbase/engineering/atmos name = "Atmospherics" + ambience = AMBIENCE_ATMOS /area/groundbase/engineering/atmos/monitoring name = "Atmospherics Monitoring" @@ -231,6 +239,7 @@ name = "Cargo" holomap_color = HOLOMAP_AREACOLOR_CARGO icon_state = "orawhisqu" + ambience = AMBIENCE_HANGAR /area/groundbase/cargo/office name = "Cargo Office" /area/groundbase/cargo/bay @@ -246,6 +255,7 @@ name = "Civilian" holomap_color = HOLOMAP_AREACOLOR_CIV icon_state = "grewhisqu" + ambience = AMBIENCE_FOREBODING /area/groundbase/civilian/arrivals name = "Arrivals" /area/groundbase/civilian/toolstorage @@ -264,6 +274,7 @@ name = "Kitchen Back Room" /area/groundbase/civilian/chapel name = "Chapel" + ambience = AMBIENCE_CHAPEL /area/groundbase/civilian/chapel/office name = "Chaplain's Office" /area/groundbase/civilian/library @@ -284,6 +295,7 @@ name = "Exploration" holomap_color = HOLOMAP_AREACOLOR_SCIENCE icon_state = "purwhisqu" + ambience = AMBIENCE_GENERIC /area/groundbase/exploration/equipment name = "Exploration Equipment Room" /area/groundbase/exploration/shuttlepad @@ -294,6 +306,7 @@ holomap_color = HOLOMAP_AREACOLOR_DORMS icon_state = "grawhisqu" flags = RAD_SHIELDED | BLUE_SHIELDED + ambience = AMBIENCE_GENERIC /area/groundbase/dorms/bathroom name = "Dormitory Bathroom" /area/groundbase/dorms/room1 @@ -317,6 +330,7 @@ name = "Substation" holomap_color = HOLOMAP_AREACOLOR_ENGINEERING icon_state = "yelwhitri" + ambience = AMBIENCE_SUBSTATION /area/maintenance/groundbase/substation/medcargo name = "Medical/Cargo Substation" /area/maintenance/groundbase/substation/secsci @@ -337,7 +351,10 @@ /area/maintenance/groundbase/level1/swtunnel name = "\improper Level 1 Southwest Tunnel" +/area/groundbase/mining + name = "Mining" + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/old_forboding/forboding1.ogg', 'sound/ambience/old_forboding/forboding2.ogg') /area/groundbase/mining/unexplored - name = "Mining" + icon_state = "orablacir" /area/groundbase/mining/explored - name = "Mining" + icon_state = "blublacir" diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 11a940f004..c3653b9a5b 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -441,6 +441,8 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" invisibility = 0 + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER /obj/effect/step_trigger/teleporter/to_mining/Initialize() . = ..() teleport_x = x @@ -451,6 +453,9 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" invisibility = 0 + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + /obj/effect/step_trigger/teleporter/from_mining/Initialize() . = ..() teleport_x = x From 1473179b268db234edf087af228dc4bb63436dc1 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 2 Apr 2022 08:07:33 -0400 Subject: [PATCH 2/2] Yup --- maps/groundbase/gb-z1.dmm | 10 +--------- maps/groundbase/groundbase_areas.dm | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 7784ba0014..98abd1ea60 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -2526,14 +2526,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) -"gX" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(67) - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/warden) "gY" = ( /obj/machinery/telecomms/hub/preset/groundbase, /turf/simulated/floor/tiled/dark{ @@ -24178,7 +24170,7 @@ Jp zg mi VV -gX +Pl qa zK uc diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index aa352a021b..39b031b7db 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -353,7 +353,7 @@ /area/groundbase/mining name = "Mining" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/old_forboding/forboding1.ogg', 'sound/ambience/old_forboding/forboding2.ogg') + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg') /area/groundbase/mining/unexplored icon_state = "orablacir" /area/groundbase/mining/explored