cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes map edges (#10915)

Browse Source
This commit is contained in:
tacoguy7765093
2025-05-17 10:44:06 -05:00
committed by GitHub
parent b54d687f70
commit 0fe755a711
5 changed files with 106 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modular_chomp/maps/submaps/surface_submaps/mountains/Geyser2.dmm
View File

@@ -3,7 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
/obj/random/turf/lava,
/obj/random/turf/lava/sif,
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/cave/geyser_2)
"c" = (

42
modular_chomp/maps/submaps/surface_submaps/mountains/Geyser3.dmm
View File

@@ -7,22 +7,22 @@
dir = 9;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"c" = (
/obj/structure/cliff/automatic,
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"d" = (
/obj/random/turf/lava,
/turf/simulated/floor/outdoors/rocks/caves,
/obj/random/turf/lava/sif,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"e" = (
/obj/structure/cliff/automatic{
dir = 5;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"f" = (
/obj/structure/cliff/automatic/corner{
@@ -32,32 +32,28 @@
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/cave/geyser_3)
"g" = (
/turf/simulated/floor/lava{
nitrogen = 93.7835;
oxygen = 20.7263;
temperature = 243.15
},
/turf/simulated/floor/lava/turfpack/sif,
/area/submap/cave/geyser_3)
"h" = (
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"i" = (
/obj/structure/cliff/automatic/corner,
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"j" = (
/obj/structure/cliff/automatic{
dir = 8;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"k" = (
/obj/structure/cliff/automatic{
dir = 4;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"l" = (
/obj/effect/map_effect/interval/effect_emitter/steam,
@@ -71,50 +67,46 @@
/obj/effect/map_effect/interval/effect_emitter/smoke/fire{
interval_upper_bound = 1200
},
/turf/simulated/floor/lava{
nitrogen = 93.7835;
oxygen = 20.7263;
temperature = 243.15
},
/turf/simulated/floor/lava/turfpack/sif,
/area/submap/cave/geyser_3)
"m" = (
/obj/structure/cliff/automatic{
dir = 10;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"n" = (
/obj/structure/cliff/automatic/corner{
dir = 10;
icon_state = "cliffbuilder-corner"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"o" = (
/obj/structure/cliff/automatic/corner{
dir = 6;
icon_state = "cliffbuilder-corner"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"p" = (
/obj/structure/cliff/automatic{
dir = 6;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"q" = (
/obj/structure/cliff/automatic{
dir = 2;
icon_state = "cliffbuilder"
},
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
"r" = (
/obj/random/multiple/minevault,
/turf/simulated/floor/outdoors/rocks/caves,
/turf/simulated/floor/outdoors/rocks/caves/turfpack/sif,
/area/submap/cave/geyser_3)
(1,1,1) = {"

78
modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm
View File

@@ -1,4 +1,8 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"aH" = (
/obj/machinery/button/remote/blast_door{
id = "bountycellA"
@@ -18,7 +22,7 @@
/area/submap/BountyHunters)
"aZ" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"cL" = (
/obj/structure/table/sifwoodentable,
@@ -36,7 +40,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"dR" = (
/turf/template_noop,
@@ -77,11 +81,11 @@
icon_state = "1-8"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"kx" = (
/obj/machinery/light/small,
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"lT" = (
/obj/structure/railing,
@@ -89,7 +93,7 @@
dir = 8
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"mi" = (
/mob/living/simple_mob/clowns/destroyer,
@@ -190,7 +194,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 9
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"wc" = (
/obj/structure/grille,
@@ -252,7 +256,7 @@
},
/obj/machinery/power/port_gen/pacman,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Gi" = (
/obj/structure/cable{
@@ -261,7 +265,7 @@
},
/mob/living/simple_mob/humanoid/merc/ranged/sniper,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Gq" = (
/obj/structure/table/sifwoodentable,
@@ -299,7 +303,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"KN" = (
/obj/structure/railing,
@@ -307,12 +311,12 @@
dir = 4
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"LV" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"LX" = (
/obj/structure/table/steel,
@@ -348,7 +352,7 @@
"NE" = (
/obj/structure/railing,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"NZ" = (
/obj/structure/grille,
@@ -375,7 +379,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"PP" = (
/obj/machinery/power/apc{
@@ -388,13 +392,13 @@
icon_state = "0-8"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"QW" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"QX" = (
/mob/living/simple_mob/humanoid/cultist/noodle,
@@ -423,7 +427,7 @@
icon_state = "4-8"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Tc" = (
/obj/machinery/power/terminal{
@@ -434,7 +438,7 @@
icon_state = "0-4"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Uc" = (
/obj/machinery/door/blast/regular{
@@ -468,7 +472,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"Zl" = (
/obj/effect/floor_decal/industrial/warning{
@@ -477,10 +481,10 @@
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"Zm" = (
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
(1,1,1) = {"
@@ -609,9 +613,9 @@ zl
QY
qG
pn
qG
qG
qG
aa
aa
aa
zl
VU
VU
@@ -636,9 +640,9 @@ xM
qG
qG
zl
qG
qG
qG
aa
aa
aa
lT
VU
VU
@@ -665,7 +669,7 @@ qG
zl
SR
Tc
qG
aa
NE
VU
VU
@@ -692,7 +696,7 @@ RC
zl
PP
Gi
qG
aa
NE
VU
VU
@@ -935,7 +939,7 @@ qG
zl
SR
Tc
qG
aa
lT
VU
VU
@@ -962,7 +966,7 @@ RC
zl
PP
Gi
qG
aa
NE
VU
VU
@@ -989,7 +993,7 @@ qG
zl
FN
jO
qG
aa
NE
VU
VU
@@ -1014,9 +1018,9 @@ fM
qG
qG
zl
qG
qG
qG
aa
aa
aa
KN
VU
VU
@@ -1041,9 +1045,9 @@ zl
tU
qG
pn
qG
qG
qG
aa
aa
aa
zl
VU
VU

78
modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm
View File

@@ -1,4 +1,8 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"aB" = (
/obj/structure/table/steel,
/obj/machinery/recharger,
@@ -24,7 +28,7 @@
dir = 8
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"cI" = (
/obj/machinery/light/small{
@@ -39,13 +43,13 @@
},
/obj/machinery/power/port_gen/pacman,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"dI" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"eH" = (
/obj/structure/table/steel,
@@ -195,7 +199,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"tE" = (
/obj/effect/floor_decal/corner/grey/diagonal,
@@ -237,7 +241,7 @@
"xt" = (
/obj/structure/railing,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"yz" = (
/obj/structure/table/steel,
@@ -256,7 +260,7 @@
icon_state = "0-8"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"zM" = (
/obj/machinery/button/remote/blast_door{
@@ -296,7 +300,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 9
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"Gz" = (
/obj/structure/grille,
@@ -317,7 +321,7 @@
/area/submap/BountyHunters)
"Hj" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"HF" = (
/obj/machinery/door/blast/regular{
@@ -332,7 +336,7 @@
icon_state = "1-8"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"IW" = (
/obj/machinery/power/terminal{
@@ -343,7 +347,7 @@
icon_state = "0-4"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Jn" = (
/obj/structure/railing,
@@ -351,13 +355,13 @@
dir = 4
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Kq" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"Ly" = (
/obj/structure/grille,
@@ -377,7 +381,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"Nt" = (
/obj/machinery/light/small{
@@ -393,7 +397,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"Pr" = (
/obj/structure/table/steel,
@@ -416,13 +420,13 @@
icon_state = "4-8"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Re" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"SL" = (
/obj/structure/table/sifwoodentable,
@@ -438,7 +442,7 @@
/area/submap/BountyHunters)
"Us" = (
/obj/machinery/light/small,
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"VQ" = (
/obj/structure/grille,
@@ -458,7 +462,7 @@
/turf/simulated/floor/concrete,
/area/submap/BountyHunters)
"Wj" = (
/turf/simulated/floor/outdoors/dirt,
/turf/simulated/floor/outdoors/dirt/turfpack/sif,
/area/submap/BountyHunters)
"WC" = (
/obj/machinery/light/small,
@@ -474,7 +478,7 @@
name = "bounty sniper"
},
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/concrete,
/turf/simulated/floor/concrete/turfpack/sif,
/area/submap/BountyHunters)
"Yz" = (
/obj/item/bedsheet/purple,
@@ -620,9 +624,9 @@ mf
Nt
rC
eY
rC
rC
rC
aa
aa
aa
mf
PK
PK
@@ -647,9 +651,9 @@ fY
rC
rC
mf
rC
rC
rC
aa
aa
aa
bw
PK
PK
@@ -676,7 +680,7 @@ rC
mf
PN
IW
rC
aa
xt
PK
PK
@@ -703,7 +707,7 @@ WC
mf
zu
WF
rC
aa
xt
PK
PK
@@ -730,7 +734,7 @@ rC
mf
db
Ii
rC
aa
Jn
PK
PK
@@ -946,7 +950,7 @@ rC
mf
PN
IW
rC
aa
bw
PK
PK
@@ -973,7 +977,7 @@ WC
mf
zu
WF
rC
aa
xt
PK
PK
@@ -1000,7 +1004,7 @@ rC
mf
db
Ii
rC
aa
xt
PK
PK
@@ -1025,9 +1029,9 @@ Gz
rC
rC
mf
rC
rC
rC
aa
aa
aa
Jn
PK
PK
@@ -1052,9 +1056,9 @@ mf
cI
tE
eY
rC
rC
rC
aa
aa
aa
mf
PK
PK

6
modular_chomp/maps/~turfpacks/packs_sim/turfpacks_sim_tiled.dm
View File

@@ -953,3 +953,9 @@
nitrogen = TURFPACK_N2
phoron = TURFPACK_PHORON
carbon_dioxide = TURFPACK_CO2
/turf/simulated/floor/concrete/turfpack/TURFPACK_PACKNAME
temperature = TURFPACK_TEMP
oxygen = TURFPACK_O2
nitrogen = TURFPACK_N2
phoron = TURFPACK_PHORON
carbon_dioxide = TURFPACK_CO2