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

Fixes edges of 3c wilds having wrong atmos in mineral walls

Browse Source
This commit is contained in:
Casey
2022-09-03 16:35:53 +00:00
committed by CHOMPStation2
parent 740a487eb0
commit 95809d9ff7
10 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/planet/virgo3c_vr.dm
+1
View File
@@ -545,6 +545,7 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/glass/reinforced)
VIRGO3C_TURF_CREATE(/turf/simulated/open)
VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/dark)
VIRGO3C_TURF_CREATE(/turf/simulated/mineral)
VIRGO3C_TURF_CREATE(/turf/simulated/mineral/ignore_cavegen)
VIRGO3C_TURF_CREATE(/turf/simulated/floor)
VIRGO3C_TURF_CREATE(/turf/simulated/floor/wood)
VIRGO3C_TURF_CREATE(/turf/simulated/floor/wood/sif)
maps/groundbase/eastwilds/eastwilds1.dmm
+11
View File
@@ -36,8 +36,19 @@
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
/area/groundbase/wilderness/east)
"y" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/east)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/east)
"B" = (
/obj/effect/landmark{
name = "carpspawn"
},
/turf/simulated/floor/water/virgo3c,
/area/submap/groundbase/wilderness/east)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"F" = (
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/groundbase/wilderness/east/unexplored)
maps/groundbase/eastwilds/eastwilds2.dmm
+5
View File
@@ -26,8 +26,13 @@
},
/area/groundbase/wilderness/east)
"r" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/east)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/east)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"t" = (
/turf/simulated/floor/water/deep/virgo3c,
/area/groundbase/wilderness/east)
maps/groundbase/northwilds/northwilds1.dmm
+5
View File
@@ -13,8 +13,13 @@
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
/area/groundbase/wilderness/north)
"m" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/north)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/north)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"p" = (
/obj/effect/map_effect/portal/master/side_a/gb_wilds/north_south,
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
maps/groundbase/northwilds/northwilds2.dmm
+5
View File
@@ -22,8 +22,13 @@
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/groundbase/wilderness/north)
"m" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/north)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/north)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"o" = (
/turf/simulated/mineral/cave/virgo3c,
/area/groundbase/wilderness/north/cave)
maps/groundbase/southwilds/southwilds1.dmm
+5
View File
@@ -42,8 +42,13 @@
/turf/simulated/mineral/cave/virgo3c,
/area/groundbase/wilderness/south/cave)
"Q" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/south)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/south)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"S" = (
/obj/effect/map_effect/portal/master/side_b/gb_wilds/south,
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
maps/groundbase/southwilds/southwilds2.dmm
+5
View File
@@ -41,8 +41,13 @@
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/groundbase/wilderness/south)
"Q" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/south)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/south)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"S" = (
/obj/effect/map_effect/portal/master/side_b/gb_wilds/south,
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
maps/groundbase/southwilds/southwilds3.dmm
+1 -1
View File
@@ -84,7 +84,7 @@
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/submap/groundbase/wilderness/south)
"Q" = (
/turf/simulated/mineral/ignore_cavegen,
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/south)
"S" = (
/obj/effect/map_effect/portal/master/side_b/gb_wilds/south,
maps/groundbase/westwilds/westwilds1.dmm
+5
View File
@@ -2085,8 +2085,13 @@
/turf/simulated/floor,
/area/groundbase/science/outpost/atmos)
"zM" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/west)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/west)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"zP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black,
/turf/simulated/floor/tiled/white,
maps/groundbase/westwilds/westwilds2.dmm
+5
View File
@@ -446,8 +446,13 @@
},
/area/groundbase/wilderness/west)
"fM" = (
<<<<<<< HEAD
/turf/simulated/mineral/ignore_cavegen,
/area/groundbase/wilderness/west)
=======
/turf/simulated/mineral/ignore_cavegen/virgo3c,
/area/submap/groundbase/wilderness/west)
>>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs
"fQ" = (
/obj/machinery/chem_master,
/obj/machinery/camera/network/research_outpost{