cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove sky islands, retouch wilderness shelter for single Z courtesy of Bib (#7805)

Browse Source
This commit is contained in:
Raeschen
2024-02-21 20:36:44 +01:00
committed by GitHub
parent 7eabb7b371
commit 5ab4e43201
7 changed files with 859 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/southern_cross/overmap/sectors.dm
+4 -4
View File
@@ -7,9 +7,8 @@
[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, Z_LEVEL_SURFACE_SKYLANDS)
map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD, Z_LEVEL_SURFACE_SKYLANDS, Z_LEVEL_SURFACE_VALLEY)
map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD, Z_LEVEL_SURFACE_VALLEY)
//Z_LEVEL_SURFACE_SKYLANDS, //removed due to lack of use
initial_generic_waypoints = list(
"outpost_nw",
@@ -65,7 +64,8 @@
start_y = 10
known = 1 // lets Sectors appear on shuttle navigation for easy finding.
extra_z_levels = list(Z_LEVEL_TRANSIT, Z_LEVEL_MISC,Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD, Z_LEVEL_SURFACE_SKYLANDS, Z_LEVEL_SURFACE_VALLEY) //This should allow for comms to reach people from the station. Basically this defines all the areas of Southern Cross and the Sif local system on the overmap.
extra_z_levels = list(Z_LEVEL_TRANSIT, Z_LEVEL_MISC,Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD, Z_LEVEL_SURFACE_VALLEY) //This should allow for comms to reach people from the station. Basically this defines all the areas of Southern Cross and the Sif local system on the overmap.
// "Z_LEVEL_SURFACE_SKYLANDS, " //removed due to lack of use
initial_generic_waypoints = list(
"d1_aux_a",
maps/southern_cross/southern_cross-10.dmm
+835 -200
View File
File diff suppressed because it is too large Load Diff
maps/southern_cross/southern_cross-5.dmm
+1 -5
View File
@@ -13663,10 +13663,6 @@
},
/turf/simulated/floor/plating,
/area/surface/outpost/main/gen_room/smes_right)
"ze" = (
/obj/machinery/telecomms/relay/preset/southerncross/skylands,
/turf/simulated/floor/tiled/techmaint,
/area/surface/outpost/main/tcomm)
"zf" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -70536,7 +70532,7 @@ uh
BB
xI
nw
ze
nw
Er
AW
ha
maps/southern_cross/southern_cross.dm
+2 -2
View File
@@ -51,8 +51,8 @@
#include "southern_cross-8.dmm" //Centcom z7
#include "southern_cross-9.dmm" //Transit z8
#include "southern_cross-10.dmm" //Sif wilds z9
#include "southern_cross-12.dmm" //Skylands z10
#include "southern_cross-13.dmm" //Valley z11 seemingly. For stranger critters and POIs.
// #include "southern_cross-12.dmm" //Skylands z10 //Remove due to lack of use
#include "southern_cross-13.dmm" //Valley z10 seemingly. For stranger critters and POIs.
#endif
// #include "southern_cross-casino.dmm" //CHOMPedit: Disabled to save resources and loaded in during events - Jack
maps/southern_cross/southern_cross_areas.dm
+2
View File
@@ -98,6 +98,7 @@
name = "Mountains"
icon_state = "darkred"
/* //Sky islands removal, lack of use
/area/surface/outside/wilderness/skylands
name = "Floating Islands"
icon_state = "blue"
@@ -106,6 +107,7 @@
name = "Sky"
icon_state = "red"
luminosity = 1
*/
/area/surface/outside/path/wilderness
maps/southern_cross/southern_cross_defines.dm
+11 -8
View File
@@ -16,14 +16,15 @@ but they don't actually change anything about the load order
#define Z_LEVEL_CENTCOM 7
#define Z_LEVEL_TRANSIT 8
#define Z_LEVEL_SURFACE_WILD 9
#define Z_LEVEL_SURFACE_SKYLANDS 10
#define Z_LEVEL_SURFACE_VALLEY 11
#define Z_LEVEL_VR_REALM 12
#define Z_LEVEL_FUELDEPOT 13
#define Z_LEVEL_GATEWAY 14
#define Z_LEVEL_SURFACE_VALLEY 10
#define Z_LEVEL_VR_REALM 11
#define Z_LEVEL_FUELDEPOT 12
#define Z_LEVEL_GATEWAY 13
//#define Z_LEVEL_SURFACE_SKYLANDS //Sky islands removal due to lack of use
//#define Z_LEVEL_AEROSTAT //Disabled due to lack of use
//#define Z_LEVEL_NS_MINE //Disabled due to lack of use
//#define Z_LEVEL_AEROSTAT 15 //Disabled due to lack of use
//#define Z_LEVEL_NS_MINE 16 //Disabled due to lack of use
//#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.
@@ -247,11 +248,13 @@ but they don't actually change anything about the load order
flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES
base_turf = /turf/simulated/floor/outdoors/rocks
/* //Sky islands removal due to lack of use
/datum/map_z_level/southern_cross/surface_skylands
z = Z_LEVEL_SURFACE_SKYLANDS
name = "Floating Islands"
flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES
base_turf = /turf/simulated/open
*/
/datum/map_z_level/southern_cross/surface_valley
z = Z_LEVEL_SURFACE_VALLEY
@@ -318,7 +321,7 @@ but they don't actually change anything about the load order
Z_LEVEL_SURFACE,
Z_LEVEL_SURFACE_MINE,
Z_LEVEL_SURFACE_WILD,
Z_LEVEL_SURFACE_SKYLANDS,
//Z_LEVEL_SURFACE_SKYLANDS, //Sky islands removal due to lack of use
Z_LEVEL_SURFACE_VALLEY
)
//Z_LEVEL_SURFACE_CASINO //CHOMPedit - KSC = So there is weather on the Casino. //Move this into /datum/planet/sif and remember to add a coma for the new entry, for when you need the casino again
maps/southern_cross/southern_cross_presets.dm
+4 -1
View File
@@ -72,10 +72,12 @@ var/const/NETWORK_CARRIER = "Exploration Carrier" //CHOMPedit: Exploration outp
listening_level = Z_LEVEL_MISC
autolinkers = list("exp_relay")
/* //Sky islands removal due to lack of use
/obj/machinery/telecomms/relay/preset/southerncross/skylands
id = "Sky Island Relay"
listening_level = Z_LEVEL_SURFACE_SKYLANDS
autolinkers = list("sky_relay")
*/
/obj/machinery/telecomms/relay/preset/southerncross/valley
id = "Valley Relay"
@@ -100,8 +102,9 @@ var/const/NETWORK_CARRIER = "Exploration Carrier" //CHOMPedit: Exploration outp
id = "Hub"
network = "tcommsat"
autolinkers = list("hub",
"d1_relay", "d2_relay", "d3_relay", "pnt_relay", "cve_relay", "wld_relay", "tns_relay", "cnt_relay", "explorer", "exp_relay", "sky_relay", "valley_relay",
"d1_relay", "d2_relay", "d3_relay", "pnt_relay", "cve_relay", "wld_relay", "tns_relay", "cnt_relay", "explorer", "exp_relay", "valley_relay",
//"belt_relay", // Chompstation edit - adds belt outpost to relays. Temp Removal of Belt Relay TFF 15/2/20, Added Valley comn stuff 2/14/2023
//"sky_relay", // Sky islands removal due to lack of use
"science", "medical", "supply", "service", "common", "command", "engineering", "security", "unused",
"hb_relay", "receiverA", "broadcasterA"
) //CHOMPedit: Adds "exp_relay"