diff --git a/maps/expedition_vr/space/_fueldepot.dm b/maps/expedition_vr/space/_fueldepot.dm index 503fe77692..04455a02b3 100644 --- a/maps/expedition_vr/space/_fueldepot.dm +++ b/maps/expedition_vr/space/_fueldepot.dm @@ -1,17 +1,20 @@ +//CHOMP Edit: Appropriating this file for our needs and lore. /obj/effect/overmap/visitable/sector/fueldepot name = "Fuel Depot" desc = "Self-service refueling depot." - scanner_desc = @{"[i]Registration[/i]: Virgo-Erigonne System Authority + scanner_desc = @{"[i]Registration[/i]: Vir System Authority [i]Class[/i]: Installation (Space) -[i]Transponder[/i]: Transmitting (CIV), V-E.S.A. +[i]Transponder[/i]: Transmitting (CIV), V.S.A. [b]Notice[/b]: This facility classified for public use for the purpose of refueling and recharging starships"} icon_state = "fueldepot" initial_generic_waypoints = list("fueldepot_east","fueldepot_west","fueldepot_north","fueldepot_south") unknown_state = "station" known = TRUE icon_state = "fueldepot_g" + start_x = 10 + start_y = 11 -/area/tether_away/fueldepot +/area/sc_away/fueldepot name = "Away Mission - Fuel Depot" icon = 'icons/turf/areas_vr.dmi' icon_state = "dark" diff --git a/maps/southern_cross/overmap/sectors.dm b/maps/southern_cross/overmap/sectors.dm index 717af80290..2fa52d5c90 100644 --- a/maps/southern_cross/overmap/sectors.dm +++ b/maps/southern_cross/overmap/sectors.dm @@ -1,6 +1,12 @@ // Overmap object for Sif, hanging in the void of space /obj/effect/overmap/visitable/planet/Sif name = "Sif" + desc = "Location of Vir civilian colonies." + scanner_desc = @{"[i]Registration[/i]: Vir System Authority +[i]Class[/i]: Colony +[i]Transponder[/i]: Transmitting (CIV), Vir IFF +[b]Notice[/b]: The Vir government welcomes you to this world."} + map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD) in_space = 0 start_x = 10 @@ -34,6 +40,10 @@ name = "Southern Cross" icon_state = "object" desc = "Southern Cross station, orbiting Sif." + scanner_desc = @{"[i]Registration[/i]: NLS Southern Cross +[i]Class[/i]: Installation +[i]Transponder[/i]: Transmitting (NT), NanoTrasen IFF +[b]Notice[/b]: NanoTrasen communications station, authorized personnel only"} base = 1 in_space = 1 start_x = 10 diff --git a/maps/southern_cross/southern_cross_defines.dm b/maps/southern_cross/southern_cross_defines.dm index a98bd955b3..f83ef1f59a 100644 --- a/maps/southern_cross/southern_cross_defines.dm +++ b/maps/southern_cross/southern_cross_defines.dm @@ -3,15 +3,16 @@ #define Z_LEVEL_STATION_ONE 1 #define Z_LEVEL_STATION_TWO 2 #define Z_LEVEL_STATION_THREE 3 -//#define Z_LEVEL_EMPTY_SPACE 4 //CHOMPedit: Disabling empty space as now the overmap generates empty space on demand. Z_LEVEL_SURFACE and below have been decreased by 1 because byond fucks things if you don't do that. #define Z_LEVEL_SURFACE 4 #define Z_LEVEL_SURFACE_MINE 5 -#define Z_LEVEL_MISC 6 +#define Z_LEVEL_MISC 6 //Carrier, actually #define Z_LEVEL_CENTCOM 7 #define Z_LEVEL_TRANSIT 8 #define Z_LEVEL_SURFACE_WILD 9 -#define Z_LEVEL_GATEWAY 11 //CHOMPedit - KSC = changed 10-11 so weather works on casino. #define Z_LEVEL_SURFACE_CASINO 10 //CHOMPedit - KSC = So there is weather on the casino. +#define Z_LEVEL_GATEWAY 11 //CHOMPedit - KSC = changed 10-11 so weather works on casino. +//#define Z_LEVEL_EMPTY_SPACE 12 //CHOMPedit: Disabling empty space as now the overmap generates empty space on demand. Z_LEVEL_SURFACE and below have been decreased by 1 because byond fucks things if you don't do that. +#define Z_LEVEL_FUELDEPOT 13 /datum/map/southern_cross name = "Southern Cross" @@ -39,7 +40,7 @@ starsys_name = "Vir" use_overmap = TRUE overmap_size = 50 - overmap_event_areas = 85 + overmap_event_areas = 44 shuttle_docked_message = "The scheduled shuttle to the %dock_name% has docked with the station at docks one and two. It will depart in approximately %ETD%." shuttle_leaving_dock = "The Crew Transfer Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." @@ -100,13 +101,12 @@ Z_LEVEL_SURFACE_MINE ) - //CHOMPStation Addition Start - Prior addition for Belt Miner system. TFF - Commenting out 15/2/20 - /* + // Framework for porting Tether's lateload Z-Level system lateload_z_levels = list( - list("Mining Asteroid Belt"), //Stock lateload maps + list("Fuel Depot - Z1 Space") //Stock lateload maps ) - */ + //CHOMPStation Addition End lateload_single_pick = list( list("Carp Farm"), @@ -179,7 +179,7 @@ z = Z_LEVEL_STATION_ONE name = "Deck 1" base_turf = /turf/space - transit_chance = 6 + transit_chance = 10 holomap_offset_x = SOUTHERN_CROSS_HOLOMAP_MARGIN_X - 40 holomap_offset_y = SOUTHERN_CROSS_HOLOMAP_MARGIN_Y + SOUTHERN_CROSS_MAP_SIZE*0 @@ -187,7 +187,7 @@ z = Z_LEVEL_STATION_TWO name = "Deck 2" base_turf = /turf/simulated/open - transit_chance = 6 + transit_chance = 10 holomap_offset_x = SOUTHERN_CROSS_HOLOMAP_MARGIN_X - 40 holomap_offset_y = SOUTHERN_CROSS_HOLOMAP_MARGIN_Y + SOUTHERN_CROSS_MAP_SIZE*1 @@ -195,7 +195,7 @@ z = Z_LEVEL_STATION_THREE name = "Deck 3" base_turf = /turf/simulated/open - transit_chance = 6 + transit_chance = 10 holomap_offset_x = HOLOMAP_ICON_SIZE - SOUTHERN_CROSS_HOLOMAP_MARGIN_X - SOUTHERN_CROSS_MAP_SIZE - 40 holomap_offset_y = SOUTHERN_CROSS_HOLOMAP_MARGIN_Y + SOUTHERN_CROSS_MAP_SIZE*1 @@ -204,7 +204,7 @@ z = Z_LEVEL_EMPTY_SPACE name = "Empty" flags = MAP_LEVEL_PLAYER - transit_chance = 76 + transit_chance = 60 */ /datum/map_z_level/southern_cross/surface z = Z_LEVEL_SURFACE @@ -235,7 +235,7 @@ z = Z_LEVEL_MISC name = "Misc" flags = MAP_LEVEL_PLAYER|MAP_LEVEL_VORESPAWN - transit_chance = 6 + transit_chance = 10 /datum/map_z_level/southern_cross/centcom z = Z_LEVEL_CENTCOM @@ -376,4 +376,4 @@ . += "The NLS [full_name] is a small waystation in orbit of the frozen garden world of Sif, jewel of the Vir system.
" . += "Though Vir is typically peaceful, the system has seen its fair share of conflict in the face of technological extremists, rogue drone intelligence, and worse.
" . += "As an employee of NanoTrasen, operators of the Southern Cross and one of the galaxy's largest research corporations, you're probably just here to do a job." - return jointext(., "
") + return jointext(., "
") diff --git a/maps/southern_cross/submaps/_southern_cross_submaps.dm b/maps/southern_cross/submaps/_southern_cross_submaps.dm index d5e7c7dc13..2368b01e3b 100644 --- a/maps/southern_cross/submaps/_southern_cross_submaps.dm +++ b/maps/southern_cross/submaps/_southern_cross_submaps.dm @@ -47,6 +47,7 @@ // Commented out until we either port or replace away missions, but this is the framework for loading each away mission. ////////////////////////////////////////////////////////////////////////////////////// + // Gateway submaps go here /datum/map_template/sc_lateload/gateway name = "Gateway Submap" @@ -73,6 +74,19 @@ associated_map_datum = /datum/map_z_level/sc_lateload/gateway_destination +//Space submaps/sectors/POIs/whatever you wanna freaking call it, go here. +#include "../../expedition_vr/space/_fueldepot.dm" +/datum/map_template/sc_lateload/away_fueldepot + name = "Fuel Depot - Z1 Space" + desc = "An unmanned fuel depot floating in space." + mappath = 'maps/expedition_vr/space/fueldepot.dmm' + associated_map_datum = /datum/map_z_level/sc_lateload/away_fueldepot + +/datum/map_z_level/sc_lateload/away_fueldepot + name = "Away Mission - Fuel Depot" + z = Z_LEVEL_FUELDEPOT + + ////////////////////////////////////////////////////////////////////////////////////// // Code Shenanigans for lateload maps