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

[MIRROR] hotsprings (#6727)

Browse Source 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
CHOMPStation2
2023-08-06 01:05:36 +02:00
committed by GitHub
co-authored by Casey Raeschen
parent eb68ea1645
commit 04857c569e
8 changed files with 472 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/groundbase/groundbase_defines.dm
+2 -12
View File
@@ -234,7 +234,8 @@
list("Abandoned Island"),
list("Dark Adventure"),
list("Eggnog Town Underground","Eggnog Town"),
list("Star Dog")
list("Star Dog"),
list("Hotsprings")
)
lateload_gb_north = list(
@@ -462,9 +463,6 @@
name = "Remmi Aerostat - Z1 Aerostat"
desc = "The Virgo 2 Aerostat away mission."
mappath = 'maps/expedition_vr/aerostat/aerostat.dmm'
<<<<<<< HEAD
associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat
=======
associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat
////////////////////////////////////////////////////////////////////////
@@ -537,8 +535,6 @@
desc = "Wilderness"
mappath = 'maps/groundbase/southwilds/southwilds2.dmm'
associated_map_datum = /datum/map_z_level/gb_lateload/gb_south_wilds
<<<<<<< HEAD
=======
/datum/map_template/gb_lateload/wilds/south/type3
name = "Southern Wilds 3"
desc = "Wilderness"
@@ -550,7 +546,6 @@
//seed_submaps(list(Z_LEVEL_GB_WILD_S), 6, /area/submap/groundbase/poi/wildvillage/plot/square, /datum/map_template/groundbase/wildvillage/square) //POI seeding
//seed_submaps(list(Z_LEVEL_GB_WILD_S), 2, /area/submap/groundbase/poi/wildvillage/plot/wide, /datum/map_template/groundbase/wildvillage/wide)
//seed_submaps(list(Z_LEVEL_GB_WILD_S), 1, /area/submap/groundbase/poi/wildvillage/plot/long, /datum/map_template/groundbase/wildvillage/long)
>>>>>>> 6aa6c45620... Merge pull request #12842 from Heroman3003/poi-guarantee
/datum/map_template/gb_lateload/wilds/east/type1
name = "Eastern Wilds 1"
@@ -584,8 +579,3 @@
*/
////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
>>>>>>> ae6ecf6fb4... Merge pull request #12817 from Very-Soft/gbwilds
=======
>>>>>>> 26e29da7c4... Merge pull request #13242 from ItsSelis/selis-multiz