diff --git a/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dm b/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dm index a2f597f8ac..6321c84ed0 100644 --- a/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dm +++ b/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dm @@ -13,7 +13,7 @@ // -- Overmap -- // - +/* // Moved to kara.dm as this is part of the planet and future planet z-levels are planned. Also seems important for overmap to run properly. /obj/effect/overmap/visitable/sector/aerostat name = "Aerostat" desc = "Abandoned aerostat installation, floating in the low stratosphere." @@ -29,7 +29,7 @@ in_space = 0 start_x = 14 start_y = 15 - +*/ // extra_z_levels = list(Z_LEVEL_AEROSTAT_2) //SOON @@ -117,70 +117,7 @@ // -- Turfs -- // - -//Atmosphere properties //CHOMP Comment: I guess this Kara planetary information should go here. Kara is a gas giant, it ain't gonna be getting very many other maps. -#define KARA_ONE_ATMOSPHERE 101.5 //kPa -#define KARA_AVG_TEMP 150 //kelvin - -#define KARA_PER_N2 0.10 //percent -#define KARA_PER_O2 0.03 -#define KARA_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm -#define KARA_PER_CO2 0.87 -#define KARA_PER_PHORON 0.00 - -//Math only beyond this point -#define KARA_MOL_PER_TURF (KARA_ONE_ATMOSPHERE*CELL_VOLUME/(KARA_AVG_TEMP*R_IDEAL_GAS_EQUATION)) -#define KARA_MOL_N2 (KARA_MOL_PER_TURF * KARA_PER_N2) -#define KARA_MOL_O2 (KARA_MOL_PER_TURF * KARA_PER_O2) -#define KARA_MOL_N2O (KARA_MOL_PER_TURF * KARA_PER_N2O) -#define KARA_MOL_CO2 (KARA_MOL_PER_TURF * KARA_PER_CO2) -#define KARA_MOL_PHORON (KARA_MOL_PER_TURF * KARA_PER_PHORON) - -//Turfmakers -#define KARA_SET_ATMOS nitrogen=KARA_MOL_N2;oxygen=KARA_MOL_O2;carbon_dioxide=KARA_MOL_CO2;phoron=KARA_MOL_PHORON;temperature=KARA_AVG_TEMP -#define KARA_TURF_CREATE(x) x/kara/nitrogen=KARA_MOL_N2;x/kara/oxygen=KARA_MOL_O2;x/kara/carbon_dioxide=KARA_MOL_CO2;x/kara/phoron=KARA_MOL_PHORON;x/kara/temperature=KARA_AVG_TEMP;x/kara/color="#eacd7c" - -/turf/unsimulated/floor/sky/kara_sky - name = "kara atmosphere" - desc = "Be careful where you step!" - color = "#eacd7c" - KARA_SET_ATMOS - does_skyfall = FALSE - -/turf/unsimulated/floor/sky/kara_sky/Entered(atom/movable/AM, atom/oldloc) - . = ..() - if(isobserver(AM)) - return //Don't ghostport, very annoying - if(AM.throwing) - return //Being thrown over, not fallen yet - if(!(AM.can_fall())) - return // Phased shifted kin should not fall - if(istype(AM, /obj/item/projectile)) - return // pewpew should not fall out of the sky. pew. - if(istype(AM, /obj/effect/projectile)) - return // ...neither should the effects be falling - - var/mob/living/L - if(isliving(AM)) - L = AM - if(L.is_floating) - return //Flyers/nograv can ignore it - - qdel(AM) - -/turf/simulated/shuttle/wall/voidcraft/green/kara - KARA_SET_ATMOS - color = "#eacd7c" - -/turf/simulated/shuttle/wall/voidcraft/green/kara/nocol - color = null - -KARA_TURF_CREATE(/turf/unsimulated/wall/planetary) - -KARA_TURF_CREATE(/turf/simulated/wall) -KARA_TURF_CREATE(/turf/simulated/floor/plating) -KARA_TURF_CREATE(/turf/simulated/floor/bluegrid) -KARA_TURF_CREATE(/turf/simulated/floor/tiled/techfloor) +// Most turfs moved to kara.dm for use in future kara maps. /* KARA_TURF_CREATE(/turf/simulated/mineral) diff --git a/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dmm b/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dmm index 9f511d586a..1cb6986a59 100644 --- a/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dmm +++ b/maps/southern_cross/overmap/planets/kara/aerostat/aerostat.dmm @@ -1,6 +1,6 @@ "aa" = (/turf/simulated/wall/virgo2,/area/sc_away/aerostat) "ab" = (/obj/structure/cable/heavyduty{icon_state = "2-8"},/obj/effect/decal/cleanable/cobweb2,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating/kara,/area/sc_away/aerostat/inside) -"ac" = (/obj/effect/overmap/visitable/sector/aerostat,/turf/unsimulated/floor/sky/kara_sky,/area/sc_away/aerostat) +"ac" = (/obj/effect/overmap/visitable/planet/kara,/turf/unsimulated/floor/sky/kara_sky,/area/sc_away/aerostat) "ad" = (/obj/effect/decal/cleanable/blood,/turf/simulated/floor/tiled/techfloor/kara,/area/sc_away/aerostat/inside) "ae" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/industrial/warning/dust{dir = 9},/obj/effect/floor_decal/rust,/turf/simulated/floor/plating/kara,/area/sc_away/aerostat/solars) "af" = (/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/effect/floor_decal/industrial/warning/dust{dir = 1},/obj/machinery/power/solar,/obj/effect/floor_decal/rust,/turf/simulated/floor/plating/kara,/area/sc_away/aerostat/solars) diff --git a/maps/southern_cross/overmap/planets/kara/kara.dm b/maps/southern_cross/overmap/planets/kara/kara.dm index 8b89381ef5..e9afe483b1 100644 --- a/maps/southern_cross/overmap/planets/kara/kara.dm +++ b/maps/southern_cross/overmap/planets/kara/kara.dm @@ -1,30 +1,106 @@ +//Atmosphere properties //CHOMP Comment: I guess this Kara planetary information should go here. Kara is a gas giant, it ain't gonna be getting very many other maps. +#define KARA_ONE_ATMOSPHERE 101.5 //kPa +#define KARA_AVG_TEMP 150 //kelvin + +#define KARA_PER_N2 0.10 //percent +#define KARA_PER_O2 0.03 +#define KARA_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm +#define KARA_PER_CO2 0.87 +#define KARA_PER_PHORON 0.00 + +//Math only beyond this point +#define KARA_MOL_PER_TURF (KARA_ONE_ATMOSPHERE*CELL_VOLUME/(KARA_AVG_TEMP*R_IDEAL_GAS_EQUATION)) +#define KARA_MOL_N2 (KARA_MOL_PER_TURF * KARA_PER_N2) +#define KARA_MOL_O2 (KARA_MOL_PER_TURF * KARA_PER_O2) +#define KARA_MOL_N2O (KARA_MOL_PER_TURF * KARA_PER_N2O) +#define KARA_MOL_CO2 (KARA_MOL_PER_TURF * KARA_PER_CO2) +#define KARA_MOL_PHORON (KARA_MOL_PER_TURF * KARA_PER_PHORON) + +//Turfmakers +#define KARA_SET_ATMOS nitrogen=KARA_MOL_N2;oxygen=KARA_MOL_O2;carbon_dioxide=KARA_MOL_CO2;phoron=KARA_MOL_PHORON;temperature=KARA_AVG_TEMP +#define KARA_TURF_CREATE(x) x/kara/nitrogen=KARA_MOL_N2;x/kara/oxygen=KARA_MOL_O2;x/kara/carbon_dioxide=KARA_MOL_CO2;x/kara/phoron=KARA_MOL_PHORON;x/kara/temperature=KARA_AVG_TEMP;x/kara/color="#eacd7c" + // Overmap object for Kara, hanging in the void of space /obj/effect/overmap/visitable/planet/kara name = "Kara" - desc = "The seat of NT power in the Vir system lies in the asteroid colony orbiting Kara, the NCS Northern Star." + desc = "Uninhabitable gas giant. Derelict installations present in the upper atmosphere." scanner_desc = @{"[i]Stellar Body[/i]: Kara -[i]Class[/i]: Jovian Colony -[i]Transponder[/i]: Transmitting (NT), NanoTrasen IFF -[i]Habitability[/i]: Low (High Temperature, Toxic Atmosphere). Habitats in orbit. -[b]Notice[/b]: NT security is currently restricting free flights to Northern Star."} - map_z = list(Z_LEVEL_NS_MINE) //Using the northern star mine as the map. Located in /maps/southern_cross/overmap/planets/kara/northern_star/ - extra_z_levels = list(Z_LEVEL_NS_MINE) +[i]Registration[/i]: Vir System Authority +[i]Class[/i]: Installation +[i]Transponder[/i]: Transmitting (CIV), Vir IFF +[b]Notice[/b]: CONDEMNED! NO ENTRY! -Vir System Authority"} + + map_z = list(Z_LEVEL_AEROSTAT) // Using the aerostat as the map as it is the only z-level in the atmosphere. Located in /maps/southern_cross/overmap/planets/kara/aerostat/ initial_generic_waypoints = list("northern_star_mine_dock", "northern_star_mine_echidna_dock") //northern_star.dm landmarks - in_space = 1 start_x = 14 start_y = 14 skybox_offset_x = 128 skybox_offset_y = 128 - surface_color = "#AD9100" - mountain_color = "#AD9100" - water_color = "#AD9100" + surface_color = "#AD9100" // While many of these vars don't really make sense for a gas giant, they're necessary for the planet image generation we currently have. + mountain_color = "#A58A00" // Maybe we'll have a proper gas giant later. + water_color = "#A88D00" ice_color = "#AD9100" + atmosphere_color = "#C19562" icon_state = "chlorine" known = 1 + initial_generic_waypoints = list("aerostat_west","aerostat_east","aerostat_south","aerostat_northwest","aerostat_northeast") + + +/obj/effect/overmap/visitable/planet/kara/get_skybox_representation() + var/image/tmp = ..() + tmp.pixel_x = skybox_offset_x + tmp.pixel_y = skybox_offset_y + return tmp /obj/effect/overmap/visitable/planet/kara/Initialize() + atmosphere = new(CELL_VOLUME) // Necessary for the planet overmap icon to generate properly, but gas type does not seem to matter. + atmosphere.adjust_gas_temp("carbon_dioxide", KARA_MOL_CO2, KARA_AVG_TEMP) + atmosphere.adjust_gas_temp("nitrogen", KARA_MOL_N2, KARA_AVG_TEMP) + atmosphere.adjust_gas_temp("oxygen", KARA_MOL_O2, KARA_AVG_TEMP) + . = ..() + docking_codes = null -/obj/effect/overmap/visitable/planet/kara/get_space_zlevels() //These are the primary levels that our space station resides in. This also indicates what levels astronauts can drift into. - return list(Z_LEVEL_NS_MINE) \ No newline at end of file + +/turf/unsimulated/floor/sky/kara_sky + name = "kara atmosphere" + desc = "Be careful where you step!" + color = "#eacd7c" + KARA_SET_ATMOS + does_skyfall = FALSE + +/turf/unsimulated/floor/sky/kara_sky/Entered(atom/movable/AM, atom/oldloc) + . = ..() + if(isobserver(AM)) + return //Don't ghostport, very annoying + if(AM.throwing) + return //Being thrown over, not fallen yet + if(!(AM.can_fall())) + return // Phased shifted kin should not fall + if(istype(AM, /obj/item/projectile)) + return // pewpew should not fall out of the sky. pew. + if(istype(AM, /obj/effect/projectile)) + return // ...neither should the effects be falling + + var/mob/living/L + if(isliving(AM)) + L = AM + if(L.is_floating) + return //Flyers/nograv can ignore it + + qdel(AM) + +/turf/simulated/shuttle/wall/voidcraft/green/kara + KARA_SET_ATMOS + color = "#eacd7c" + +/turf/simulated/shuttle/wall/voidcraft/green/kara/nocol + color = null + +KARA_TURF_CREATE(/turf/unsimulated/wall/planetary) + +KARA_TURF_CREATE(/turf/simulated/wall) +KARA_TURF_CREATE(/turf/simulated/floor/plating) +KARA_TURF_CREATE(/turf/simulated/floor/bluegrid) +KARA_TURF_CREATE(/turf/simulated/floor/tiled/techfloor) diff --git a/maps/southern_cross/overmap/planets/kara/northern_star/northern_star.dm b/maps/southern_cross/overmap/planets/kara/northern_star/northern_star.dm index ff10eaedf5..55ce9d82b0 100644 --- a/maps/southern_cross/overmap/planets/kara/northern_star/northern_star.dm +++ b/maps/southern_cross/overmap/planets/kara/northern_star/northern_star.dm @@ -10,41 +10,33 @@ name = "Northern Star mines" z = Z_LEVEL_NS_MINE +/datum/map_template/sc_lateload/northern_star/on_map_loaded(z) + . = ..() + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_NS_MINE, world.maxx, world.maxy) // Create caves. + new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_NS_MINE, 64, 64) // Create the mining ore distribution map. // -- Overmap -- // //This is actually in kara.dm one folder back. // Overmap object for Kara, hanging in the void of space -/obj/effect/overmap/visitable/planet/kara - name = "Kara" +/obj/effect/overmap/visitable/sector/northern_star_mines + name = "Northern Star" + icon_state = "object" desc = "The seat of NT power in the Vir system lies in the asteroid colony orbiting Kara, the NCS Northern Star." scanner_desc = @{"[i]Stellar Body[/i]: Kara [i]Class[/i]: Jovian Colony [i]Transponder[/i]: Transmitting (NT), NanoTrasen IFF -[i]Habitability[/i]: Low (High Temperature, Toxic Atmosphere). Habitats in orbit. +[i]Habitability[/i]: Low (High Pressure, Toxic Atmosphere). Habitats in orbit. [b]Notice[/b]: NT security is currently restricting free flights to Northern Star."} -// map_z = list(Z_LEVEL_NS_MINE) //Using the northern star mine as the map. Located in /maps/southern_cross/overmap/planets/kara/northern_star/ -// extra_z_levels = list(Z_LEVEL_NS_MINE) - initial_generic_waypoints = list("northern_star_mine_dock", "northern_star_mine_echidna_dock") //northern_star.dm landmarks in_space = 1 known = TRUE start_x = 14 start_y = 14 - skybox_offset_x = 128 - skybox_offset_y = 128 - surface_color = "#AD9100" - mountain_color = "#AD9100" - water_color = "#AD9100" - ice_color = "#AD9100" - icon_state = "chlorine" + extra_z_levels = list(Z_LEVEL_AEROSTAT) // Should inform the overmap that kara and NS are in the same sector despite being different locations. + initial_generic_waypoints = list("northern_star_mine_dock", "northern_star_mine_echidna_dock") //northern_star.dm landmarks -/obj/effect/overmap/visitable/planet/kara/Initialize() - . = ..() - docking_codes = null - -/obj/effect/overmap/visitable/planet/kara/get_space_zlevels() //These are the primary levels that our space station resides in. This also indicates what levels astronauts can drift into. +/obj/effect/overmap/visitable/sector/northern_star_mines/get_space_zlevels()//These are the primary levels that our space station resides in. This also indicates what levels astronauts can drift into. return list(Z_LEVEL_NS_MINE) //May add more later - // -- Areas -- // /area/outpost/medical @@ -94,9 +86,8 @@ name = "Northern Star Mine - Echidna Dock" landmark_tag = "northern_star_mine_echidna_dock" - // -- Turfs -- // /turf/simulated/mineral/floor/ignore_mapgen/airless oxygen = 0 nitrogen = 0 - temperature = TCMB \ No newline at end of file + temperature = TCMB diff --git a/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm b/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm index 9a346f0444..5475c6a957 100644 --- a/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm +++ b/maps/southern_cross/overmap/planets/kara/northern_star/northern_star_mine.dmm @@ -1,7 +1,7 @@ "aa" = (/turf/space,/area/space) "ab" = (/obj/effect/landmark{name = "carpspawn"},/turf/space,/area/space) "ac" = (/turf/space,/area/syndicate_station/mining) -"ad" = (/turf/simulated/mineral,/area/mine/unexplored) +"ad" = (/turf/simulated/mineral/vacuum,/area/mine/unexplored) "ae" = (/turf/simulated/wall/r_wall,/area/outpost/research/mixing) "af" = (/turf/simulated/wall/r_wall,/area/outpost/research/hallway/toxins_hallway) "ag" = (/turf/simulated/wall/r_wall,/area/outpost/research/tox_store) @@ -1584,7 +1584,7 @@ "Ex" = (/obj/machinery/door/airlock/glass_medical{name = "Medical Outpost"; req_access = list(5)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/white,/area/outpost/medical/rec) "Ey" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/outpost/medical/dorm) "Ez" = (/obj/structure/mirror{pixel_x = 30; pixel_y = -2},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/alarm{alarms_hidden = 1; frequency = 1439; pixel_y = 22},/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/freezer,/area/outpost/medical/dorm) -"EA" = (/turf/simulated/mineral,/area/mine/explored) +"EA" = (/turf/simulated/mineral/vacuum,/area/mine/explored) "EB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/mine/explored) "EC" = (/turf/simulated/wall/r_wall,/area/outpost/medical/airlocks) "ED" = (/turf/simulated/wall,/area/outpost/medical/airlocks) @@ -2024,7 +2024,7 @@ "MV" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9; icon_state = "intact"},/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost Airlock"; dir = 1},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "MW" = (/obj/machinery/pipedispenser/disposal,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) "MX" = (/obj/machinery/pipedispenser,/turf/simulated/floor/tiled,/area/outpost/engineering/storage) -"MY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/storage) +"MY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/engineering/storage) "MZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 82.1472; oxygen = 21.8366; temperature = 293.15},/area/outpost/engineering/telecomms) "Na" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/outpost/engineering/telecomms) "Nb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/camera/network/engineering_outpost{c_tag = "ENG - Outpost TeleCommunications"; dir = 1},/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 82.1472; oxygen = 21.8366; temperature = 293.15},/area/outpost/engineering/telecomms) @@ -2313,7 +2313,7 @@ "Sy" = (/turf/simulated/floor/airless,/area/mine/explored) "Sz" = (/obj/structure/lattice,/obj/structure/grille,/turf/space,/area/mine/explored) "SA" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/mine/explored) -"SB" = (/obj/effect/overmap/visitable/planet/kara,/turf/space,/area/space) +"SB" = (/obj/effect/overmap/visitable/sector/northern_star_mines,/turf/space,/area/space) "SC" = (/obj/effect/shuttle_landmark/premade/northern_star/ns_mine_echidna_dock,/turf/space,/area/space) (1,1,1) = {" diff --git a/maps/southern_cross/overmap/space/fueldepot.dm b/maps/southern_cross/overmap/space/fueldepot.dm index 44e0f75b0f..3f6f1c43ef 100644 --- a/maps/southern_cross/overmap/space/fueldepot.dm +++ b/maps/southern_cross/overmap/space/fueldepot.dm @@ -25,7 +25,7 @@ icon_state = "fueldepot_g" unknown_state = "station" known = TRUE - start_x = 10 + start_x = 10 // Future note: remove these two vars if we ever want this to have a random spawn location on the overmap. start_y = 11 diff --git a/maps/southern_cross/southern_cross.dm b/maps/southern_cross/southern_cross.dm index 24fb76bb93..d7cc783251 100644 --- a/maps/southern_cross/southern_cross.dm +++ b/maps/southern_cross/southern_cross.dm @@ -43,8 +43,8 @@ #if !AWAY_MISSION_TEST //Don't include these for just testing away missions if the flag is set to true in /code/_away_mission_tests.dm #include "southern_cross-1.dmm" //Deck 1 z1 #include "southern_cross-2.dmm" //Deck 2 z2 - #include "southern_cross-3.dmm" //Deck 3 z2 -// #include "southern_cross-4.dmm" //Empty space CHOMPedit: Disabling empty space map because the overmap now generates empty space on its own for space transit.7 + #include "southern_cross-3.dmm" //Deck 3 z3 +// #include "southern_cross-4.dmm" //Empty space CHOMPedit: Disabling empty space map because the overmap now generates empty space on its own for space transit. #include "southern_cross-5.dmm" //Sif outpost z4 #include "southern_cross-6.dmm" //Sif mine z5 #include "southern_cross-7.dmm" //Carrier z6 @@ -55,7 +55,7 @@ #endif // #include "southern_cross-casino.dmm" //CHOMPedit: Disabled to save resources and loaded in during events - Jack - #include "submaps/_southern_cross_submaps.dm" //This contains gateway stuff + #include "submaps/_southern_cross_submaps.dm" //This contains VR world and gateway stuff //PLANETS, installations, sectors, ships, etc for the overmap, I want put here. Add new comments and includes when you make new planets diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm index c4ed1d9530..f2b56e330c 100644 --- a/maps/southern_cross/southern_cross_defines.dm +++ b/maps/southern_cross/southern_cross_defines.dm @@ -17,10 +17,11 @@ but they don't actually change anything about the load order #define Z_LEVEL_TRANSIT 8 #define Z_LEVEL_SURFACE_WILD 9 #define Z_LEVEL_SURFACE_SKYLANDS 10 -#define Z_LEVEL_FUELDEPOT 11 -#define Z_LEVEL_AEROSTAT 12 -#define Z_LEVEL_NS_MINE 13 -#define Z_LEVEL_GATEWAY 14 +#define Z_LEVEL_VR_REALM 11 +#define Z_LEVEL_FUELDEPOT 12 +#define Z_LEVEL_AEROSTAT 13 +#define Z_LEVEL_NS_MINE 14 +#define Z_LEVEL_GATEWAY 15 //#define Z_LEVEL_SURFACE_CASINO xx //CHOMPedit - KSC = So there is weather on the casino. //Raz - When you do casino again, launch it in a test server, note what z-level it is on, and then replace xx with that z-level you noted. Revert back to xx and comment out when done. //#define Z_LEVEL_EMPTY_SPACE xx //CHOMPedit: Disabling empty space as now the overmap generates empty space on demand. @@ -31,9 +32,9 @@ but they don't actually change anything about the load order full_name = "Southern Cross" path = "southern_cross" - lobby_icon = 'icons/misc/CHOMPSTATION.gif' //CHOMPStation Edit TFF 24/12/19 - _ch.dmi - lobby_screens = list() //CHOMPStation Edit TFF 24/12/19 - CHOMPStation image - id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' //CHOMPStation Edit 25/1/20 TFF - Job icons for off-duty/exploration + lobby_icon = 'icons/misc/CHOMPSTATION.gif' //CHOMPStation Edit + lobby_screens = list() //CHOMPStation Edit - CHOMPStation image + id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' //CHOMPStation Edit - Job icons for off-duty/exploration holomap_smoosh = list(list( Z_LEVEL_STATION_ONE, @@ -116,6 +117,7 @@ but they don't actually change anything about the load order // Framework for porting Tether's lateload Z-Level system //Stock lateload maps lateload_z_levels = list( + list("VR World"), list("Fuel Depot - Z1 Space"), list("Kara Aerostat - Z1 Aerostat"), list("Kara - Z1 Northern Star") @@ -168,7 +170,7 @@ but they don't actually change anything about the load order // If Space submaps are made, add a line to make them here as well. // Now for the tunnels. (This decides the load order of ore generation and cave generation. Check Random_Map to see % ) - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/automata/cave_system/(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level. new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SURFACE_MINE, 64, 64) // Create the mining ore distribution map. // Todo: Forest generation. return 1 diff --git a/maps/southern_cross/submaps/_southern_cross_submaps.dm b/maps/southern_cross/submaps/_southern_cross_submaps.dm index ee07a51a86..50757bd593 100644 --- a/maps/southern_cross/submaps/_southern_cross_submaps.dm +++ b/maps/southern_cross/submaps/_southern_cross_submaps.dm @@ -4,31 +4,7 @@ /////////////////////////////////////////////////////////////////////////////// // Primary Load - these are areas that will ALWAYS be in play. -//Temp Removal TFF 15/2/20 -/* -// Rykka adds Belt Mining -#include "asteroid_belt/_templates.dm" -#include "asteroid_belt/belt_miner_things.dm" -/datum/map_template/sc_lateload/sc_belt_miner - name = "Mining Asteroid Belt" - desc = "Mining, but harder, and in spess." - mappath = 'sc_belt_miner.dmm' - - associated_map_datum = /datum/map_z_level/sc_lateload/belt_miner - -/datum/map_z_level/sc_lateload/belt_miner - name = "Asteroid Belt" - flags = MAP_LEVEL_SEALED|MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT - z = Z_LEVEL_BELT - -/datum/map_template/sc_lateload/sc_belt_miner/on_map_loaded(z) // code needed to run ore generation - . = ..() - seed_submaps(list(Z_LEVEL_BELT), 300, /area/mine/unexplored/belt_miner, /datum/map_template/asteroid_belt) // Give this Z-level 3x normal points for POI generation. - new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_BELT, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_BELT, 64, 64) // Create the mining ore distribution map. - -*/ ////////////////////////////////////////////////////////////////////////////// /// Away Missions /// If you're reading this and want to add a new away mission, reference /tether/submaps/_tether_submaps.dm or existing away missions for how to set it up. @@ -75,7 +51,15 @@ //VR maps go here, tell me if theres a better way to load this #include "virtual_reality/constructVR.dm" -#include "virtual_reality/constructVR.dmm" +/datum/map_template/sc_lateload/vr_world + name = "VR World" + desc = "A dynamic, virtual world." + mappath = 'virtual_reality/constructVR.dmm' + associated_map_datum = /datum/map_z_level/sc_lateload/vr_world + +/datum/map_z_level/sc_lateload/vr_world + name = "Away Mission - Fuel Depot" + z = Z_LEVEL_VR_REALM //Space submaps/sectors/POIs/whatever you wanna freaking call it, go here. #include "../../expedition_vr/space/_fueldepot.dm" diff --git a/maps/southern_cross/submaps/virtual_reality/constructVR.dm b/maps/southern_cross/submaps/virtual_reality/constructVR.dm index 1e3e4bc8a5..d6ef07bbbe 100644 --- a/maps/southern_cross/submaps/virtual_reality/constructVR.dm +++ b/maps/southern_cross/submaps/virtual_reality/constructVR.dm @@ -1,4 +1,4 @@ -w// -- Areas -- // +// -- Areas -- // /area/vr name = "VR world" @@ -27,12 +27,34 @@ w// -- Areas -- // power_environ = 1 power_light = 1 - - /area/vr/powered/bluebase name = "Blue Base" icon_state = "bluenew" /area/vr/powered/redbase name = "Red Base" - icon_state = "red" \ No newline at end of file + icon_state = "red" + +// -- Objects -- // +/obj/effect/fake_sun/always_day + name = "fake sun" + desc = "Deletes itself, but first updates all the lighting on outdoor turfs to cool colors." + possible_light_setups = list( + + list( + "brightness" = 6.0, + "color" = "#ABfff7" + ), + list( + "brightness" = 4.0, + "color" = "#F4EA55" + ), + list( + "brightness" = 2.5, + "color" = "#EE9AC6" + ), + list( + "brightness" = 1.0, + "color" = "#F07AD8" + ) + ) diff --git a/maps/southern_cross/submaps/virtual_reality/constructVR.dmm b/maps/southern_cross/submaps/virtual_reality/constructVR.dmm index 893e58b960..bff7c9a88e 100644 --- a/maps/southern_cross/submaps/virtual_reality/constructVR.dmm +++ b/maps/southern_cross/submaps/virtual_reality/constructVR.dmm @@ -1405,7 +1405,7 @@ "Of" = (/obj/machinery/door/firedoor/glass,/obj/structure/table/reinforced,/obj/machinery/door/window/northright{dir = 4; name = "Medical booth"},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/shuttle/floor/white,/area/vr/powered) "Og" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/reinforced,/area/vr/powered/redbase) "Oh" = (/turf/simulated/mineral/sif,/area/vr/outdoors/powered) -"Oi" = (/obj/effect/fake_sun{possible_light_setups = list(list("brightness"=6,"color"="#abfff7"),list("brightness"=4,"color"="#F4EA55"),list("brightness"=2.5,"color"="#EE9AC6"),list("brightness"=1.5,"color"="#F07AD8"),list("brightness"=1.5,"color"="#61AEF3"))},/turf/simulated/floor/outdoors/newdirt_nograss{temperature = 293.15},/area/vr/outdoors/powered) +"Oi" = (/obj/effect/fake_sun/always_day,/turf/simulated/floor/outdoors/newdirt_nograss{temperature = 293.15},/area/vr/outdoors/powered) "Oj" = (/obj/effect/floor_decal/techfloor/corner{dir = 10},/turf/simulated/floor/cult,/area/vr/powered) "Ok" = (/obj/structure/table/rack/shelf/steel,/obj/random/maintenance/engineering,/obj/random/maintenance/medical,/obj/random/maintenance/research,/turf/simulated/shuttle/floor/voidcraft,/area/vr/powered) "Ol" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9},/turf/simulated/floor/tiled/techmaint,/area/vr/powered)