Merge branch 'master' into pixote-map-update

# Conflicts:
#	data/text/po/sv.po

data/text/po/sv.po

@@ -1954,40 +1954,51 @@ msgid ""
 "Even though the residents of Modoc attempted to weather the drought, their "
 "dreams along with their crops withered to dust."
 msgstr ""
+"Trots att invånarna i Modoc försökte klara sig undan torkan blev deras "
+"drömmar och grödor till damm."
 
 #. indexed_txt
 #: cuts/nar_ncr1.txt:1
 msgid ""
 "Your help with Vault 15 launched the New California Republic's push to "
 "civilize its neighbors."
 msgstr ""
+"Din hjälp med Valv 15 ledde Nya Kaliforniska Republikens strävan att "
+"civilisera sina grannar."
 
 #. indexed_txt
 #: cuts/nar_ncr1.txt:2
 msgid ""
 "Though there were many more obstacles to overcome, the NCR now had a "
 "foothold into the northern wastes."
 msgstr ""
+"Även om det fanns många fler hinder att övervinna hade NKR nu fått fotfäste "
+"i de norra ödemarkerna."
 
 #. indexed_txt
 #: cuts/nar_ncr2.txt:1
 msgid ""
 "The failure of diplomacy at Vault 15 slowed the New California Republic's "
 "growth into the north."
 msgstr ""
+"Diplomatins misslyckande vid Vault 15 bromsade den nya kaliforniska "
+"republikens tillväxt i norr."
 
 #. indexed_txt
 #: cuts/nar_ncr2.txt:2
 msgid ""
 "Embarrassed by the failure, President Tandi was replaced by Roger Westin."
 msgstr ""
+"President Tandi skämdes över misslyckandet och ersattes av Roger Westin."
 
 #. indexed_txt
 #: cuts/nar_ncr2.txt:3
 msgid ""
 "When the new government finally returned to Vault 15, they found nothing but"
 " a ghost town."
 msgstr ""
+"När den nya regeringen till slut återvände till Vault 15 fann de inget annat "
+"än en spökstad."
 
 #. indexed_txt
 #: cuts/nar_ncr3.txt:1
@@ -2001,13 +2012,16 @@ msgstr ""
 #: cuts/nar_ncr3.txt:2
 msgid "As President, Carlson wasted no time in securing his grip on power."
 msgstr ""
+"Som president slösade Carlson ingen tid med att säkra sitt grepp om makten."
 
 #. indexed_txt
 #: cuts/nar_ncr3.txt:3
 msgid ""
 "Under his rule, expansion slowed, since he was more concerned about lining "
 "his own pockets than furthering the cause of civilization."
 msgstr ""
+"Under hans styre avtog expansionen, eftersom han var mer angelägen om att "
+"fylla sina egna fickor än att främja civilisationens bästa."
 
 #. indexed_txt
 #: cuts/nar_ncr4.txt:1
@@ -2016,6 +2030,9 @@ msgid ""
 "seize control of Congress and set the New California Republic on a path to "
 "military rule."
 msgstr ""
+"Skakade av mordet på vicepresident Carlson tar högerelement kontroll över "
+"kongressen och sätter den Nya Kaliforniska Republiken på väg mot ett "
+"militärt styre."
 
 #. indexed_txt
 #: cuts/nar_ncr4.txt:2
@@ -2029,27 +2046,31 @@ msgstr ""
 msgid ""
 "The inhabitants of New Reno were slaughtered, and the city collapsed into "
 "ruin."
-msgstr ""
+msgstr "Invånarna i New Reno slaktades och staden föll samman i ruiner."
 
 #. indexed_txt
 #: cuts/nar_nr1.txt:2
 msgid ""
 "No lights shine there now, the streets home only to packs of wild dogs and "
 "vultures."
 msgstr ""
+"Inga ljus lyser där nu, gatorna är bara hem för flockar av vilda hundar och "
+"gamar."
 
 #. indexed_txt
 #: cuts/nar_nr1.txt:3
 msgid ""
 "The desert tribes avoid the giant graveyard, claiming the city is haunted by"
 " evil spirits."
 msgstr ""
+"Ökenstammarna undviker den gigantiska kyrkogården, eftersom de hävdar att "
+"staden är hemsökt av onda andar."
 
 #. indexed_txt
 #: cuts/nar_nr1.txt:4
 msgid ""
 "Some say the destruction of New Reno was a judgment from a higher power."
-msgstr ""
+msgstr "Vissa menar att förstörelsen av New Reno var en dom från en högre makt."
 
 #. indexed_txt
 #: cuts/nar_nr2.txt:1
@@ -2062,7 +2083,7 @@ msgstr ""
 #. indexed_txt
 #: cuts/nar_nr2.txt:2
 msgid "They were few in number but surprisingly resourceful."
-msgstr ""
+msgstr "De var få till antalet men förvånansvärt resursstarka."
 
 #. indexed_txt
 #: cuts/nar_nr2.txt:3

data/text/swedish/cuts/nar_mo5.txt

@@ -1,2 +1,2 @@
 1:Torkan varar i ytterligare sju långa år.
-2:Even though the residents of Modoc attempted to weather the drought, their dreams along with their crops withered to dust.
+2:Trots att invånarna i Modoc försökte klara sig undan torkan blev deras drömmar och grödor till damm.

data/text/swedish/cuts/nar_ncr1.txt

@@ -1,2 +1,2 @@
-1:Your help with Vault 15 launched the New California Republic's push to civilize its neighbors.
-2:Though there were many more obstacles to overcome, the NCR now had a foothold into the northern wastes.
+1:Din hjälp med Valv 15 ledde Nya Kaliforniska Republikens strävan att civilisera sina grannar.
+2:Även om det fanns många fler hinder att övervinna hade NKR nu fått fotfäste i de norra ödemarkerna.

data/text/swedish/cuts/nar_ncr2.txt

@@ -1,3 +1,3 @@
-1:The failure of diplomacy at Vault 15 slowed the New California Republic's growth into the north.
-2:Embarrassed by the failure, President Tandi was replaced by Roger Westin.
-3:When the new government finally returned to Vault 15, they found nothing but a ghost town.
+1:Diplomatins misslyckande vid Vault 15 bromsade den nya kaliforniska republikens tillväxt i norr.
+2:President Tandi skämdes över misslyckandet och ersattes av Roger Westin.
+3:När den nya regeringen till slut återvände till Vault 15 fann de inget annat än en spökstad.

data/text/swedish/cuts/nar_ncr3.txt

@@ -1,3 +1,3 @@
 1:Already weakened by the failure to annex Vault 15, President Tandi was forced to retire when her own Vice-President Carlson accused her of complicity in Councilman Westin's death.
-2:As President, Carlson wasted no time in securing his grip on power.
-3:Under his rule, expansion slowed, since he was more concerned about lining his own pockets than furthering the cause of civilization.
+2:Som president slösade Carlson ingen tid med att säkra sitt grepp om makten.
+3:Under hans styre avtog expansionen, eftersom han var mer angelägen om att fylla sina egna fickor än att främja civilisationens bästa.

data/text/swedish/cuts/nar_ncr4.txt

@@ -1,2 +1,2 @@
-1:Shaken by the assassination of Vice-President Carlson, right-wing elements seize control of Congress and set the New California Republic on a path to military rule.
+1:Skakade av mordet på vicepresident Carlson tar högerelement kontroll över kongressen och sätter den Nya Kaliforniska Republiken på väg mot ett militärt styre.
 2:Eventually the survivors of the Enclave find a new home in the ranks of the NCR.

data/text/swedish/cuts/nar_nr1.txt

@@ -1,4 +1,4 @@
-1:The inhabitants of New Reno were slaughtered, and the city collapsed into ruin.
-2:No lights shine there now, the streets home only to packs of wild dogs and vultures.
-3:The desert tribes avoid the giant graveyard, claiming the city is haunted by evil spirits.
-4:Some say the destruction of New Reno was a judgment from a higher power.
+1:Invånarna i New Reno slaktades och staden föll samman i ruiner.
+2:Inga ljus lyser där nu, gatorna är bara hem för flockar av vilda hundar och gamar.
+3:Ökenstammarna undviker den gigantiska kyrkogården, eftersom de hävdar att staden är hemsökt av onda andar.
+4:Vissa menar att förstörelsen av New Reno var en dom från en högre makt.

data/text/swedish/cuts/nar_nr2.txt

@@ -1,5 +1,5 @@
 1:In the years following the destruction of the Enclave, a new family arose in New Reno, following the example of a simple tribal that had once visited their city.
-2:They were few in number but surprisingly resourceful.
+2:De var få till antalet men förvånansvärt resursstarka.
 3:Driven by religious fervor, they took control of New Reno and put the other families to the spear.
 4:After their victory, they sent out many messengers across Northern California looking for their founder, without success.
 5:Many felt that the founder had been taken by the fortune spirits and now dwelled in a golden casino paradise in the sky.

data/text/swedish/cuts_female/nar_mo5.txt

@@ -1,2 +1,2 @@
 1:Torkan varar i ytterligare sju långa år.
-2:Even though the residents of Modoc attempted to weather the drought, their dreams along with their crops withered to dust.
+2:Trots att invånarna i Modoc försökte klara sig undan torkan blev deras drömmar och grödor till damm.

data/text/swedish/cuts_female/nar_ncr1.txt

@@ -1,2 +1,2 @@
-1:Your help with Vault 15 launched the New California Republic's push to civilize its neighbors.
-2:Though there were many more obstacles to overcome, the NCR now had a foothold into the northern wastes.
+1:Din hjälp med Valv 15 ledde Nya Kaliforniska Republikens strävan att civilisera sina grannar.
+2:Även om det fanns många fler hinder att övervinna hade NKR nu fått fotfäste i de norra ödemarkerna.

data/text/swedish/cuts_female/nar_ncr2.txt

@@ -1,3 +1,3 @@
-1:The failure of diplomacy at Vault 15 slowed the New California Republic's growth into the north.
-2:Embarrassed by the failure, President Tandi was replaced by Roger Westin.
-3:When the new government finally returned to Vault 15, they found nothing but a ghost town.
+1:Diplomatins misslyckande vid Vault 15 bromsade den nya kaliforniska republikens tillväxt i norr.
+2:President Tandi skämdes över misslyckandet och ersattes av Roger Westin.
+3:När den nya regeringen till slut återvände till Vault 15 fann de inget annat än en spökstad.

data/text/swedish/cuts_female/nar_ncr3.txt

@@ -1,3 +1,3 @@
 1:Already weakened by the failure to annex Vault 15, President Tandi was forced to retire when her own Vice-President Carlson accused her of complicity in Councilman Westin's death.
-2:As President, Carlson wasted no time in securing his grip on power.
-3:Under his rule, expansion slowed, since he was more concerned about lining his own pockets than furthering the cause of civilization.
+2:Som president slösade Carlson ingen tid med att säkra sitt grepp om makten.
+3:Under hans styre avtog expansionen, eftersom han var mer angelägen om att fylla sina egna fickor än att främja civilisationens bästa.

data/text/swedish/cuts_female/nar_ncr4.txt

@@ -1,2 +1,2 @@
-1:Shaken by the assassination of Vice-President Carlson, right-wing elements seize control of Congress and set the New California Republic on a path to military rule.
+1:Skakade av mordet på vicepresident Carlson tar högerelement kontroll över kongressen och sätter den Nya Kaliforniska Republiken på väg mot ett militärt styre.
 2:Eventually the survivors of the Enclave find a new home in the ranks of the NCR.

data/text/swedish/cuts_female/nar_nr1.txt

@@ -1,4 +1,4 @@
-1:The inhabitants of New Reno were slaughtered, and the city collapsed into ruin.
-2:No lights shine there now, the streets home only to packs of wild dogs and vultures.
-3:The desert tribes avoid the giant graveyard, claiming the city is haunted by evil spirits.
-4:Some say the destruction of New Reno was a judgment from a higher power.
+1:Invånarna i New Reno slaktades och staden föll samman i ruiner.
+2:Inga ljus lyser där nu, gatorna är bara hem för flockar av vilda hundar och gamar.
+3:Ökenstammarna undviker den gigantiska kyrkogården, eftersom de hävdar att staden är hemsökt av onda andar.
+4:Vissa menar att förstörelsen av New Reno var en dom från en högre makt.

data/text/swedish/cuts_female/nar_nr2.txt

@@ -1,5 +1,5 @@
 1:In the years following the destruction of the Enclave, a new family arose in New Reno, following the example of a simple tribal that had once visited their city.
-2:They were few in number but surprisingly resourceful.
+2:De var få till antalet men förvånansvärt resursstarka.
 3:Driven by religious fervor, they took control of New Reno and put the other families to the spear.
 4:After their victory, they sent out many messengers across Northern California looking for their founder, without success.
 5:Many felt that the founder had been taken by the fortune spirits and now dwelled in a golden casino paradise in the sky.

scripts_src/den/dcslave.ssl

@@ -102,8 +102,8 @@ procedure timed_event_p_proc begin
                   self_walk_to_tile(global_temp);
                end
             end else begin
-               if (tile_distance(self_tile,30302) > 3)  then begin //edit by killap - was map_next_tile
-                  anim_run_to_point_rate(30302, 5)
+               if (tile_distance(self_tile, map_next_tile) > 3)  then begin
+                  anim_run_to_point_rate(map_next_tile, 5)
                end else begin
                   destroy_object(self_obj);
                end

scripts_src/modoc/mckarl.ssl

@@ -166,7 +166,7 @@ end
 
 procedure critter_p_proc begin
    if (self_visible) then begin
-      if (self_tile == 30302) then begin //edit by killap - was map_exit_tile
+      if (self_tile == map_next_tile) then begin
          destroy_object(self_obj);
       end else if (karl_nuts) then begin
          anim_run_to_point_rate(map_next_tile, 4)