From 02e20e02ad1b2b0eeb15c1586565d0bbece8dc27 Mon Sep 17 00:00:00 2001 From: Casey Date: Tue, 16 Nov 2021 11:59:39 -0500 Subject: [PATCH] Hide da shuttle fields --- code/game/machinery/atm_ret_field.dm | 9 +++++++- maps/stellardelight/stellar_delight1.dmm | 10 ++++++++ .../stellardelight/stellar_delight_defines.dm | 23 +++++++++++++++++++ .../stellar_delight_shuttle_defs.dm | 7 ++++-- 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm index 9e9a2af168..bcf78539a7 100644 --- a/code/game/machinery/atm_ret_field.dm +++ b/code/game/machinery/atm_ret_field.dm @@ -230,4 +230,11 @@ desc = "A shimmering forcefield that keeps the good air inside and the bad air outside. It seems fairly solid, almost like it's made out of some kind of hardened light.

Note: prolonged immersion in active atmospheric retention fields may have negative long-term health consequences." icon = 'icons/obj/atm_fieldgen.dmi' icon_state = "arfg_field" - density = TRUE \ No newline at end of file + density = TRUE + +/obj/machinery/atmospheric_field_generator/perma/underdoors + field_type = /obj/structure/atmospheric_retention_field/underdoors + +/obj/structure/atmospheric_retention_field/underdoors + plane = OBJ_PLANE + layer = UNDER_JUNK_LAYER diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index 9e771fc3c9..2d296fd6ba 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -15994,6 +15994,11 @@ color = "#42038a"; icon_state = "4-8" }, +<<<<<<< HEAD +======= +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, +>>>>>>> 6db620c57c... Merge pull request #11838 from Very-Soft/miningshuttle /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/exploshuttle) "Iw" = ( @@ -17622,6 +17627,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +<<<<<<< HEAD +======= +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, +>>>>>>> 6db620c57c... Merge pull request #11838 from Very-Soft/miningshuttle /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/miningshuttle) "Mb" = ( diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellardelight/stellar_delight_defines.dm index c032d99b8a..1318631ce1 100644 --- a/maps/stellardelight/stellar_delight_defines.dm +++ b/maps/stellardelight/stellar_delight_defines.dm @@ -325,6 +325,29 @@ name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT +<<<<<<< HEAD +======= +#include "../submaps/space_rocks/space_rocks.dm" +/datum/map_template/ship_lateload/space_rocks + name = "V3b Asteroid Field" + desc = "Space debris is common in V3b's orbit due to the proximity of Virgo 3" + mappath = 'maps/submaps/space_rocks/space_rocks.dmm' + + associated_map_datum = /datum/map_z_level/ship_lateload/space_rocks + +/datum/map_template/ship_lateload/space_rocks/on_map_loaded(z) + . = ..() + seed_submaps(list(Z_LEVEL_SPACE_ROCKS), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_SPACE_ROCKS, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/spacerocks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) + +/datum/map_z_level/ship_lateload/space_rocks + z = Z_LEVEL_SPACE_ROCKS + name = "V3b Asteroid Field" + base_turf = /turf/space + flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES + +>>>>>>> 6db620c57c... Merge pull request #11838 from Very-Soft/miningshuttle /datum/map_template/ship_lateload/overmap name = "Overmap" desc = "Overmap lives here :3" diff --git a/maps/stellardelight/stellar_delight_shuttle_defs.dm b/maps/stellardelight/stellar_delight_shuttle_defs.dm index 371e0b15d4..38cf7cafd4 100644 --- a/maps/stellardelight/stellar_delight_shuttle_defs.dm +++ b/maps/stellardelight/stellar_delight_shuttle_defs.dm @@ -240,7 +240,7 @@ [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF [b]Notice[/b]: NanoTrasen Base, authorized personnel only"} known = TRUE - in_space = FALSE + in_space = TRUE icon = 'icons/obj/overmap_vr.dmi' icon_state = "virgo3b" @@ -278,4 +278,7 @@ //For ships, it's safe to assume they're big enough to not be sneaky else if(istype(AM, /obj/effect/overmap/visitable/ship)) - atc.msg(message) \ No newline at end of file + atc.msg(message) + +/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() + return list(Z_LEVEL_SPACE_ROCKS)