Skip to content

Commit 7d65cf6

Browse files
NovaRainNovaRain
committed
Merge branch 'master' into 2.4_Lite
2 parents 53bbeeb + 6b7dae7 commit 7d65cf6

File tree

2 files changed

+180
-180
lines changed

2 files changed

+180
-180
lines changed

‎data/text/english/game/map.msg‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -16,76 +16,76 @@
1616
# descriptions are just the map name itself (this also helps
1717
# pinpoint unfinished ones when you go through here).
1818
#
19-
{100}{}{Desert} // DESERT1.MAP
20-
{101}{}{Desert} // DESERT2.MAP
21-
{102}{}{Desert} // DESERT3.MAP
22-
{103}{}{Arroyo} // arcaves.MAP
23-
{104}{}{Arroyo} // arvillag.MAP
24-
{105}{}{Arroyo} // arbridge.MAP
25-
{106}{}{The Den} // denbus1.MAP
26-
{107}{}{The Den} // denbus2.MAP
27-
{108}{}{The Den} // denres1.MAP
28-
{109}{}{Klamath} // .MAP ;Downtown
29-
{110}{}{Klamath} // .MAP ;Mall
30-
{111}{}{Klamath} // .MAP ;Rat Caves
31-
{112}{}{Klamath} // .MAP ;Toxic Caves
32-
{113}{}{Klamath} // .MAP ;Trapping Caves
33-
{114}{}{Klamath} // .MAP ;Grazing Area
34-
{115}{}{Vault City} // vctyctyd.MAP
35-
{116}{}{Vault City} // vctydwtn.MAP
36-
{117}{}{Vault City} // vctycocl.MAP
37-
{118}{}{error:Map Name} // .MAP
38-
{119}{}{City Ruins} // CITY1.MAP
39-
{120}{}{Coast} // COAST1.MAP
40-
{121}{}{Coast} // COAST2.MAP
41-
{122}{}{Desert} // COLATRUK.MAP
42-
{123}{}{Desert} // FSAUSER.MAP
43-
{124}{}{error:Map Name} // RAIDERS.MAP
44-
{125}{}{error:Map Name} // SHADYE.MAP
45-
{126}{}{error:Map Name} // SHADYW.MAP
46-
{127}{}{error:Map Name} // GLOWENT.MAP
47-
{128}{}{error:Map Name} // LAADYTUM.MAP
48-
{129}{}{error:Map Name} // LAFOLLWR.MAP
49-
{130}{}{error:Map Name} // MBENT.MAP
50-
{131}{}{error:Map Name} // MBSTRG12.MAP
51-
{132}{}{error:Map Name} // MBVATS12.MAP
52-
{133}{}{error:Map Name} // MSTRLR12.MAP
53-
{134}{}{error:Map Name} // MSTRLR34.MAP
54-
{135}{}{error:Map Name} // V13ENT.MAP
55-
{136}{}{error:Map Name} // HUBENT.MAP
56-
{137}{}{Hub} // DETHCLAW.MAP
57-
{138}{}{Hub} // HUBDWNTN.MAP
58-
{139}{}{Hub} // HUBHEIGT.MAP
59-
{140}{}{Hub} // HUBOLDTN.MAP
60-
{141}{}{Hub} // HUBWATER.MAP
61-
{142}{}{Glow} // GLOW1.MAP
62-
{143}{}{Glow} // GLOW2.MAP
63-
{144}{}{Boneyard} // LABLADES.MAP
64-
{145}{}{Boneyard} // LARIPPER.MAP
65-
{146}{}{Boneyard} // LAGUNRUN.MAP
66-
{147}{}{Cathedral} // CHILDEAD.MAP
67-
{148}{}{Military} // MBDEAD.MAP
68-
{149}{}{Mountains} // MOUNTN1.MAP
69-
{150}{}{Mountains} // MOUNTN2.MAP
70-
{151}{}{Desert} // FOOT.MAP
71-
{152}{}{Desert} // TARDIS.MAP
72-
{153}{}{Desert} // TALKCOW.MAP
73-
{154}{}{Desert} // USEDCAR.MAP
74-
{155}{}{Brotherhood} // BRODEAD.MAP
75-
{156}{}{Desert} // DESCRVN1.MAP
76-
{157}{}{Desert} // DESCRVN2.MAP
77-
{158}{}{Mountains} // MNTCRVN1.MAP
78-
{159}{}{Mountains} // MNTCRVN2.MAP
19+
{100}{}{Desert} # DESERT1.MAP
20+
{101}{}{Desert} # DESERT2.MAP
21+
{102}{}{Desert} # DESERT3.MAP
22+
{103}{}{Arroyo} # arcaves.MAP
23+
{104}{}{Arroyo} # arvillag.MAP
24+
{105}{}{Arroyo} # arbridge.MAP
25+
{106}{}{The Den} # denbus1.MAP
26+
{107}{}{The Den} # denbus2.MAP
27+
{108}{}{The Den} # denres1.MAP
28+
{109}{}{Klamath} # .MAP ;Downtown
29+
{110}{}{Klamath} # .MAP ;Mall
30+
{111}{}{Klamath} # .MAP ;Rat Caves
31+
{112}{}{Klamath} # .MAP ;Toxic Caves
32+
{113}{}{Klamath} # .MAP ;Trapping Caves
33+
{114}{}{Klamath} # .MAP ;Grazing Area
34+
{115}{}{Vault City} # vctyctyd.MAP
35+
{116}{}{Vault City} # vctydwtn.MAP
36+
{117}{}{Vault City} # vctycocl.MAP
37+
{118}{}{error:Map Name} # .MAP
38+
{119}{}{City Ruins} # CITY1.MAP
39+
{120}{}{Coast} # COAST1.MAP
40+
{121}{}{Coast} # COAST2.MAP
41+
{122}{}{Desert} # COLATRUK.MAP
42+
{123}{}{Desert} # FSAUSER.MAP
43+
{124}{}{error:Map Name} # RAIDERS.MAP
44+
{125}{}{error:Map Name} # SHADYE.MAP
45+
{126}{}{error:Map Name} # SHADYW.MAP
46+
{127}{}{error:Map Name} # GLOWENT.MAP
47+
{128}{}{error:Map Name} # LAADYTUM.MAP
48+
{129}{}{error:Map Name} # LAFOLLWR.MAP
49+
{130}{}{error:Map Name} # MBENT.MAP
50+
{131}{}{error:Map Name} # MBSTRG12.MAP
51+
{132}{}{error:Map Name} # MBVATS12.MAP
52+
{133}{}{error:Map Name} # MSTRLR12.MAP
53+
{134}{}{error:Map Name} # MSTRLR34.MAP
54+
{135}{}{error:Map Name} # V13ENT.MAP
55+
{136}{}{error:Map Name} # HUBENT.MAP
56+
{137}{}{Hub} # DETHCLAW.MAP
57+
{138}{}{Hub} # HUBDWNTN.MAP
58+
{139}{}{Hub} # HUBHEIGT.MAP
59+
{140}{}{Hub} # HUBOLDTN.MAP
60+
{141}{}{Hub} # HUBWATER.MAP
61+
{142}{}{Glow} # GLOW1.MAP
62+
{143}{}{Glow} # GLOW2.MAP
63+
{144}{}{Boneyard} # LABLADES.MAP
64+
{145}{}{Boneyard} # LARIPPER.MAP
65+
{146}{}{Boneyard} # LAGUNRUN.MAP
66+
{147}{}{Cathedral} # CHILDEAD.MAP
67+
{148}{}{Military} # MBDEAD.MAP
68+
{149}{}{Mountains} # MOUNTN1.MAP
69+
{150}{}{Mountains} # MOUNTN2.MAP
70+
{151}{}{Desert} # FOOT.MAP
71+
{152}{}{Desert} # TARDIS.MAP
72+
{153}{}{Desert} # TALKCOW.MAP
73+
{154}{}{Desert} # USEDCAR.MAP
74+
{155}{}{Brotherhood} # BRODEAD.MAP
75+
{156}{}{Desert} # DESCRVN1.MAP
76+
{157}{}{Desert} # DESCRVN2.MAP
77+
{158}{}{Mountains} # MNTCRVN1.MAP
78+
{159}{}{Mountains} # MNTCRVN2.MAP
7979
{160}{}{Viper Camp}
8080
{161}{}{Desert}
8181
{162}{}{Mountains}
8282
{163}{}{Desert}
8383
{164}{}{Mountains}
84-
{165}{}{EPA} // epax.MAP
85-
{166}{}{EPA} // EPAMAIN.MAP
86-
{167}{}{EPA Warehouse} // epawrhse.MAP
87-
{168}{}{Merchant} // vilmerch.map
88-
{169}{}{Shi Submarine} // sfsub.map
84+
{165}{}{EPA} # epax.MAP
85+
{166}{}{EPA} # EPAMAIN.MAP
86+
{167}{}{EPA Warehouse} # epawrhse.MAP
87+
{168}{}{Merchant} # vilmerch.map
88+
{169}{}{Shi Submarine} # sfsub.map
8989

9090

9191
#

0 commit comments

Comments
 (0)