diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm index d946f35870c..842cc88abde 100644 --- a/code/unit_tests/zas_tests.dm +++ b/code/unit_tests/zas_tests.dm @@ -61,6 +61,7 @@ test_result["result"] = 1 test_result["msg"] = "Checked [GM_checked.len] zones" else + test_result["result"] = 1 // VOREStation Add - Why MUST we map in every area? test_result["msg"] = "No zones checked." return test_result diff --git a/icons/skybox/anomaly.dmi b/icons/skybox/anomaly.dmi new file mode 100644 index 00000000000..dc66ce65912 Binary files /dev/null and b/icons/skybox/anomaly.dmi differ diff --git a/icons/skybox/virgo2.dmi b/icons/skybox/virgo2.dmi new file mode 100644 index 00000000000..cc08c095a9d Binary files /dev/null and b/icons/skybox/virgo2.dmi differ diff --git a/icons/skybox/virgo4.dmi b/icons/skybox/virgo4.dmi index ae15d7ea9df..cdb4e592c6e 100644 Binary files a/icons/skybox/virgo4.dmi and b/icons/skybox/virgo4.dmi differ diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index 90427440328..6917ca41c00 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -14,6 +14,11 @@ known = TRUE icon_state = "chlorine" + skybox_icon = 'icons/skybox/virgo2.dmi' + skybox_icon_state = "v2" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + // -- Datums -- // /datum/shuttle/autodock/ferry/aerostat diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm index 15108a8fa15..f08d716e93a 100644 --- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm +++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm @@ -15,6 +15,11 @@ known = TRUE icon_state = "chlorine" + skybox_icon = 'icons/skybox/virgo2.dmi' + skybox_icon_state = "v2" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + /obj/effect/overmap/visitable/sector/virgo2/Initialize() for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world) docking_codes = sd.docking_codes @@ -343,3 +348,9 @@ VIRGO2_TURF_CREATE(/turf/simulated/floor/hull) icon_state = "crew_quarters" base_turf = /turf/unsimulated/floor/sky/virgo2_sky dynamic_lighting = FALSE + +/area/offmap/aerostat/surface/shuttleconsole + name = "Away Mission - Aerostat Surface Console" + icon_state = "explored" + dynamic_lighting = FALSE + requires_power = FALSE diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm index 04ca0dadcbd..c8e0a36c961 100644 --- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm +++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm @@ -3960,7 +3960,7 @@ landmark_tag = "aerostat_east"; name = "Virgo 2 Aerostat (E)" }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) "pe" = ( /obj/structure/cable/heavyduty{ @@ -4990,7 +4990,7 @@ /obj/machinery/light/small, /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/warning/dust, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) "tU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7874,7 +7874,7 @@ id_tag = "aerostat_shuttle_airlock"; pixel_y = 29 }, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) "Hq" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -9163,7 +9163,7 @@ }, /obj/effect/map_helper/airlock/atmos/pump_out_internal, /obj/effect/floor_decal/industrial/warning/dust, -/turf/simulated/shuttle/floor/yellow, +/turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) "Nu" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ @@ -26873,7 +26873,7 @@ aw aw aw bd -bI +bd bd TU vX @@ -27725,7 +27725,7 @@ aw aw aw bd -bI +bd bd Kq nS diff --git a/maps/expedition_vr/aerostat/surface.dmm b/maps/expedition_vr/aerostat/surface.dmm index 18a31bb7077..15018e9d02d 100644 --- a/maps/expedition_vr/aerostat/surface.dmm +++ b/maps/expedition_vr/aerostat/surface.dmm @@ -511,9 +511,9 @@ /turf/simulated/floor/plating/eris/under, /area/offmap/aerostat/surface/outpost/powerroom) "ql" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/rust, /obj/machinery/computer/shuttle_control/aerostat_shuttle, -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/techfloor/virgo2, /area/offmap/aerostat/surface/shuttleconsole) "qs" = ( diff --git a/maps/gateway_vr/eggnogtown.dm b/maps/gateway_vr/eggnogtown.dm index fd9d5613830..33e4f8bf3a1 100644 --- a/maps/gateway_vr/eggnogtown.dm +++ b/maps/gateway_vr/eggnogtown.dm @@ -7,6 +7,11 @@ color = "#171DFF" //bloo in_space = 0 + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "shimmer_b" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + /datum/map_template/common_lateload/gateway/eggnogtown/on_map_loaded(z) . = ..() new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. diff --git a/maps/gateway_vr/variable/arynthilake.dm b/maps/gateway_vr/variable/arynthilake.dm index 2801c092bb4..50421175f36 100644 --- a/maps/gateway_vr/variable/arynthilake.dm +++ b/maps/gateway_vr/variable/arynthilake.dm @@ -4,10 +4,17 @@ scanner_desc = @{"It is difficult to tell just what is beyond this strange shimmering shape. The air beyond seems breathable."} icon = 'icons/obj/overmap_vr.dmi' icon_state = "shimmer" + color = "#171DFF" //bloo in_space = 0 unknown_state = "field" known = FALSE + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "shimmer_b" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + + /datum/map_template/common_lateload/gateway/arynthilake/on_map_loaded(z) . = ..() new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. diff --git a/maps/gateway_vr/variable/honlethhighlands.dm b/maps/gateway_vr/variable/honlethhighlands.dm index b85d34c2821..0a01167848f 100644 --- a/maps/gateway_vr/variable/honlethhighlands.dm +++ b/maps/gateway_vr/variable/honlethhighlands.dm @@ -8,6 +8,12 @@ in_space = 0 unknown_state = "field" + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "shimmer_b" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + + /datum/map_template/common_lateload/gateway/honlethhighlands_a/on_map_loaded(z) . = ..() new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. diff --git a/maps/gateway_vr/wildwest.dm b/maps/gateway_vr/wildwest.dm index f0328570d52..e697c3812db 100644 --- a/maps/gateway_vr/wildwest.dm +++ b/maps/gateway_vr/wildwest.dm @@ -187,4 +187,8 @@ in_space = 1 unknown_state = "field" known = FALSE - \ No newline at end of file + + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "shimmer_r" + skybox_pixel_x = 0 + skybox_pixel_y = 0 \ No newline at end of file diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index 9ead050dd78..b80ffcec448 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -1894,12 +1894,12 @@ }, /obj/item/clothing/glasses/omnihud/rnd, /obj/item/clothing/gloves/sterile/latex, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/alarm/angled{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "ea" = ( @@ -5238,9 +5238,6 @@ /area/security/armoury) "lq" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -16282,7 +16279,7 @@ /obj/item/weapon/stock_parts/capacitor, /obj/item/weapon/stock_parts/capacitor, /obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 24356e99092..065e989633f 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -83,7 +83,7 @@ dir = 8 }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "aA" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/transitgateway) @@ -183,7 +183,7 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "bg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -740,7 +740,7 @@ }, /obj/machinery/light, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "dr" = ( /obj/machinery/light{ dir = 4 @@ -1121,7 +1121,7 @@ /area/crew_quarters/bar) "eJ" = ( /turf/simulated/wall/rshull, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "eK" = ( /obj/machinery/atmospherics/unary/vent_pump{ external_pressure_bound = 0; @@ -1470,7 +1470,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "gm" = ( /obj/structure/lattice, /obj/structure/cable/blue{ @@ -2190,7 +2190,7 @@ "jc" = ( /obj/machinery/computer/ship/sensors/adv, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "jd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2981,7 +2981,7 @@ dir = 4 }, /turf/simulated/floor/airless, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "mj" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3069,7 +3069,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "mA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3167,7 +3167,7 @@ "mU" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "mX" = ( /obj/structure/bed/chair{ dir = 4 @@ -5710,7 +5710,7 @@ "wr" = ( /obj/machinery/computer/ship/engines/adv, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "wt" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -5757,12 +5757,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"wJ" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/bay/reinforced, -/obj/structure/low_wall/bay/reinforced/blue, -/turf/simulated/floor, -/area/tcommsat/chamber) "wK" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 1 @@ -5831,7 +5825,7 @@ dir = 8 }, /turf/simulated/floor, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "wW" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -5857,7 +5851,7 @@ icon_state = "0-4" }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "wY" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6151,7 +6145,7 @@ pixel_y = 27 }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "yb" = ( /obj/structure/sign/deck3{ pixel_x = 32 @@ -6745,7 +6739,7 @@ dir = 1 }, /turf/simulated/floor, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "Ae" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7008,7 +7002,7 @@ pixel_y = 24 }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "Bd" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -7954,7 +7948,7 @@ /area/maintenance/stellardelight/deck3/starboardcent) "Ex" = ( /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "Ez" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -8025,7 +8019,7 @@ }, /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_ridged, -/area/tcommsat/chamber) +/area/tcommsat/computer) "EM" = ( /obj/structure/cable{ icon_state = "0-8" @@ -8202,13 +8196,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/airless, /area/maintenance/stellardelight/deck3/portcent) -"Fq" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/bay/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/structure/low_wall/bay/reinforced/blue, -/turf/simulated/floor, -/area/tcommsat/chamber) "Fr" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -10952,7 +10939,7 @@ icon_state = "2-8" }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "Pm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11336,7 +11323,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "QS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11781,7 +11768,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "SK" = ( /obj/structure/lattice, /turf/space, @@ -12696,7 +12683,7 @@ "Wj" = ( /obj/machinery/computer/ship/helm/adv, /turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "Wn" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -12846,7 +12833,7 @@ dir = 4 }, /turf/simulated/floor, -/area/shuttle/sdboat) +/area/shuttle/sdboat/fore) "WL" = ( /obj/structure/closet/crate, /obj/random/contraband, @@ -21608,7 +21595,7 @@ ad ad ad ad -ad +qq qq qq qq @@ -21750,7 +21737,7 @@ kw lx Oj Ht -Fq +uB Oe HX su @@ -21892,7 +21879,7 @@ Ze lE hw sK -wJ +zn kF Fv Uf @@ -22034,7 +22021,7 @@ qn Ze Ze Ee -Fq +uB uB uB xz @@ -22176,7 +22163,7 @@ gU lH qn sK -wJ +zn tW zn xB @@ -22460,7 +22447,7 @@ ib nm qn kb -wJ +zn Bl zn yE @@ -22602,7 +22589,7 @@ qQ Sm Sm tL -wJ +zn zn zn zY @@ -22744,7 +22731,7 @@ MO nC px sK -wJ +zn cc iL Aq @@ -22886,7 +22873,7 @@ qU oA pY sl -wJ +zn cO vN AS diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellardelight/stellar_delight_defines.dm index 5700d7f99b3..b5554f34e4f 100644 --- a/maps/stellardelight/stellar_delight_defines.dm +++ b/maps/stellardelight/stellar_delight_defines.dm @@ -124,7 +124,11 @@ default_skybox = /datum/skybox_settings/stellar_delight - unit_test_exempt_areas = list() + unit_test_exempt_areas = list( + /area/stellardelight/deck1/exterior, + /area/stellardelight/deck1/exploshuttle, + /area/stellardelight/deck1/miningshuttle + ) unit_test_exempt_from_atmos = list() //it maint @@ -468,11 +472,11 @@ name = "Starstuff" current_location = "port_shuttlepad" docking_controller_tag = "sd_bittyshuttle" - shuttle_area = list(/area/shuttle/sdboat,/area/shuttle/sdboat/aft) + shuttle_area = list(/area/shuttle/sdboat/fore,/area/shuttle/sdboat/aft) fuel_consumption = 2 defer_initialisation = TRUE -/area/shuttle/sdboat +/area/shuttle/sdboat/fore icon = 'icons/turf/areas_vr.dmi' icon_state = "yelwhitri" name = "Starstuff Cockpit" diff --git a/maps/submaps/admin_use_vr/fun.dm b/maps/submaps/admin_use_vr/fun.dm index 4544fb187cb..380f1046680 100644 --- a/maps/submaps/admin_use_vr/fun.dm +++ b/maps/submaps/admin_use_vr/fun.dm @@ -212,6 +212,45 @@ . = ..() message_admins("An uploaded sector [ADMIN_JMP(src)][ADMIN_VV(src)] has been placed on the overmap. Don't forget to rename and set cool scanner info on it!") +/obj/effect/overmap/visitable/admin_use/dark + + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "dark" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + +/obj/effect/overmap/visitable/admin_use/dark_star + + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "dark_star" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + +/obj/effect/overmap/visitable/admin_use/seven + + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "seven" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + + +/obj/effect/overmap/visitable/admin_use/bluespace_shimmer + + name = "Bluespace Shimmer" + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "shimmer_b" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + +/obj/effect/overmap/visitable/admin_use/redspace_shimmer + + name = "Redspace Shimmer" + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "shimmer_r" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + + // This is the same, but makes a whole spaceship! /obj/effect/overmap/visitable/ship/admin_use name = "REPLACE ME" @@ -232,6 +271,18 @@ . = ..() message_admins("An uploaded ship [ADMIN_JMP(src)][ADMIN_VV(src)] has been placed on the overmap. Don't forget to rename and set cool scanner info on it!") +/obj/effect/overmap/visitable/ship/admin_use/space_dog + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "space_dog" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + +/obj/effect/overmap/visitable/ship/admin_use/space_whale + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "space_whale" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + // These landmarks, placed in any map that is being represented by an overmap sector, will add themselves to landable destinations in that map! // Note the names, pick whichever makes the most sense for your map. No need to use them in any particular order or use any/all of them. /obj/effect/shuttle_landmark/automatic/admin_use1