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

Allows overmap shuttles to land on the planet plus SC icon (#7505)

Browse Source
This commit is contained in:
tacoguy7765093
2024-01-05 22:50:25 -05:00
committed by GitHub
parent 0cd59a9055
commit 5dc5f04ae3
8 changed files with 1552 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/southern_cross/overmap/sectors.dm
+13 -1
View File
@@ -11,6 +11,17 @@
map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD, Z_LEVEL_SURFACE_SKYLANDS, Z_LEVEL_SURFACE_VALLEY)
initial_generic_waypoints = list(
"outpost_nw",
"outpost_s",
"outpost_w",
"wilderness_s",
"wilderness_se",
"wilderness_w",
"wilderness_n",
"valley_e"
)
in_space = 0
start_x = 10
start_y = 10
@@ -41,7 +52,8 @@
/obj/effect/overmap/visitable/sector/Southern_Cross
name = "Southern Cross"
icon_state = "object"
icon = 'modular_chomp/icons/obj/overmap.dmi'
icon_state = "southerncross"
desc = "Southern Cross station, orbiting Sif."
scanner_desc = @{"[i]Registration[/i]: NLS Southern Cross
[i]Class[/i]: Installation
maps/southern_cross/southern_cross-10.dmm
+1171 -1043
View File
File diff suppressed because it is too large Load Diff
maps/southern_cross/southern_cross-12.dmm
+1 -5
View File
@@ -935,10 +935,6 @@
/obj/structure/flora/smallbould,
/turf/simulated/floor/water,
/area/surface/outside/wilderness/skylands)
"vo" = (
/obj/effect/overmap/visitable/planet/Sif,
/turf/simulated/mineral/sif,
/area/surface/outside/wilderness/skylands)
"vp" = (
/obj/structure/outcrop,
/turf/simulated/floor/outdoors/dirt,
@@ -2803,7 +2799,7 @@ bj
bj
bj
bj
vo
bj
aE
"}
(3,1,1) = {"
maps/southern_cross/southern_cross-13.dmm
+11 -6
View File
@@ -4,10 +4,6 @@
/obj/effect/zone_divider,
/turf/simulated/mineral/sif,
/area/surface/outside/valley/walls)
"aL" = (
/obj/effect/overmap/visitable/planet/Sif,
/turf/simulated/mineral/sif,
/area/surface/outside/valley/edge)
"bH" = (
/obj/structure/railing,
/turf/simulated/floor/water/deep,
@@ -252,6 +248,15 @@
"WT" = (
/turf/simulated/wall/wood,
/area/surface/outside/valley/inner)
"Xj" = (
/obj/effect/shuttle_landmark{
landmark_tag = "valley_e";
name = "Valley Entrance";
base_area = /area/surface/outside/valley/inner;
base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse
},
/turf/simulated/floor/outdoors/grass/sif/forest/planetuse,
/area/surface/outside/valley/inner)
"Yl" = (
/turf/simulated/mineral/sif,
/area/surface/outside/valley/inner)
@@ -776,7 +781,7 @@ FG
FG
FG
FG
aL
FG
RW
"}
(3,1,1) = {"
@@ -62811,7 +62816,7 @@ Rk
Rk
Rk
Rk
Rk
Xj
Rk
Rk
Rk
maps/southern_cross/southern_cross-5.dmm
+341 -323
View File
@@ -2650,7 +2650,7 @@
"ff" = (
/obj/effect/shuttle_landmark{
base_area = /area/surface/outside/plains/normal;
base_turf = /turf/simulated/floor/outdoors/snow/sif/planetuse;
base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse;
landmark_tag = "outpost_nw";
name = "Northwest Outpost Perimiter"
},
@@ -13779,6 +13779,17 @@
},
/turf/simulated/floor/tiled,
/area/surface/outpost/main/airlock/left_three)
"zp" = (
/obj/effect/shuttle_landmark{
base_area = /area/surface/outside/plains/normal;
base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse;
landmark_tag = "outpost_w";
name = "West Outpost Perimiter"
},
/turf/simulated/floor/outdoors/grass/sif/planetuse{
tree_chance = 0
},
/area/surface/outside/plains/normal)
"zq" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -13906,7 +13917,9 @@
landmark_tag = "outpost_s";
name = "South of Outpost"
},
/turf/simulated/floor/outdoors/grass/sif/planetuse,
/turf/simulated/floor/outdoors/grass/sif/planetuse{
tree_chance = 0
},
/area/surface/outside/plains/normal)
"zD" = (
/obj/machinery/door/firedoor/border_only,
@@ -26705,6 +26718,11 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/surface/outpost/main/janitor)
"XT" = (
/turf/simulated/floor/outdoors/grass/sif/planetuse{
tree_chance = 0
},
/area/surface/outside/plains/normal)
"XU" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/white/bordercorner,
@@ -34327,7 +34345,7 @@ zw
zw
zw
zw
ff
zw
zw
zw
zw
@@ -35463,21 +35481,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -35721,21 +35739,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -35979,21 +35997,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -36237,21 +36255,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -36397,7 +36415,7 @@ zw
zw
zw
zw
zw
ff
zw
zw
zw
@@ -36495,21 +36513,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -36753,22 +36771,22 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -37011,21 +37029,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -37269,21 +37287,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
zp
XT
XT
XT
XT
XT
yT
yT
yT
@@ -37527,21 +37545,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -37785,21 +37803,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -38043,21 +38061,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -38301,21 +38319,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -38559,21 +38577,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
Ey
yT
yT
@@ -38817,21 +38835,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
Ey
yT
yT
@@ -39075,21 +39093,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
Ey
yT
yT
@@ -39333,21 +39351,21 @@ Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
Ey
yT
yT
@@ -67006,10 +67024,10 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
XT
XT
XT
XT
yT
yT
yT
@@ -67263,11 +67281,11 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
yT
yT
yT
@@ -67519,13 +67537,13 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
Ey
yT
yT
@@ -67776,15 +67794,15 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -68034,16 +68052,16 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -68293,15 +68311,15 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -68551,15 +68569,15 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -68810,14 +68828,14 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -69068,14 +69086,14 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -69328,12 +69346,12 @@ yT
yT
yT
yT
Ey
Ey
Ey
Ey
Ey
Ey
XT
XT
XT
XT
XT
XT
yT
yT
yT
@@ -69586,10 +69604,10 @@ yT
yT
yT
yT
Ey
XT
zC
Ey
Ey
XT
XT
yT
yT
yT
maps/southern_cross/southern_cross-7.dmm
+12 -2
View File
@@ -17259,7 +17259,12 @@
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/wall/rshull,
/obj/machinery/door/airlock/voidcraft/vertical{
frequency = 1380;
id_tag = "echidna_inner";
name = "External Access"
},
/turf/simulated/floor,
/area/shuttle/echidna)
"nuL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -21959,7 +21964,12 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/turf/simulated/wall/rshull,
/obj/machinery/door/airlock/voidcraft/vertical{
frequency = 1380;
id_tag = "echidna_outer";
name = "External Access"
},
/turf/simulated/floor,
/area/shuttle/echidna)
"rdq" = (
/obj/machinery/light/small{
maps/southern_cross/southern_cross_areas.dm
+3
View File
@@ -2195,6 +2195,9 @@ End Chompstation Edit*/
icon_state = "storage"
ambience = AMBIENCE_RUINS
/area/shuttle/overmap/sif
name = "wilderness site"
icon_state = "shuttlered"
//Temp Removal TFF 15/2/20
/*
modular_chomp/icons/obj/overmap.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 317 B