diff --git a/data/text/po/russian.po b/data/text/po/russian.po
index 07a199feaa..b0f558e86a 100644
--- a/data/text/po/russian.po
+++ b/data/text/po/russian.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-07-13:52+0000\n"
-"PO-Revision-Date: 2024-09-23 23:09+0000\n"
+"PO-Revision-Date: 2024-09-24 08:09+0000\n"
 "Last-Translator: Pavel <pavel061090563pavel@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: russian\n"
@@ -76457,7 +76457,7 @@ msgid ""
 " of them ugly-ass ghouls? It's bad enough that I have to watch over my Uncle"
 " Lenny, here. Why do you ask?"
 msgstr ""
-"Гекко?  Черт, нет, вы разве не знаете, что это место кишит кривомордыми "
+"Гекко? Черт, нет, вы разве не знаете, что это место кишит кривомордыми "
 "гулями? Мне и так приходится смотреть за моим дядей Ленни. А почему вы "
 "спросили?"
 
@@ -86874,7 +86874,7 @@ msgstr "Если ты думаешь, что я тут стою для мебе
 
 #: dialog/generic.msg:3928
 msgid "You better not be planning what I think you're planning, stranger."
-msgstr "Если я правильно понимаю, что ты хочешь сделать, даже и не пытайся."
+msgstr "Ты лучше не замышляй то, что я думаю, чужак."
 
 #: dialog/generic.msg:3929
 msgid "What? Like you think I don't notice you? Get outta here!"
diff --git a/data/text/po/sv.po b/data/text/po/sv.po
index 888862c3c1..ccae710dba 100644
--- a/data/text/po/sv.po
+++ b/data/text/po/sv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-07-13:52+0000\n"
-"PO-Revision-Date: 2024-09-22 21:09+0000\n"
+"PO-Revision-Date: 2024-09-29 09:09+0000\n"
 "Last-Translator: tygyh <jonis9898@hotmail.com>\n"
 "Language-Team: none\n"
 "Language: sv\n"
@@ -18828,11 +18828,11 @@ msgstr ""
 
 #: dialog/ccmandr.msg:101
 msgid "You see the Navarro base Commander."
-msgstr ""
+msgstr "Du ser befälhavaren för Navarro-basen."
 
 #: dialog/ccmandr.msg:103 dialog/ccqmstr.msg:103
 msgid "Who the hell are you guys... Alert! Intruders on the base!"
-msgstr ""
+msgstr "Vilka fan är ni... Varning! Inkräktare på basen!"
 
 #: dialog/ccmandr.msg:104
 msgid "I don't have time to chitchat with the grunts. You're dismissed."
@@ -18840,7 +18840,7 @@ msgstr ""
 
 #: dialog/ccmandr.msg:105 dialog/ccmandr.msg:125
 msgid "Time to die."
-msgstr ""
+msgstr "Dags att dö."
 
 #: dialog/ccmandr.msg:107
 msgid ""
@@ -18854,10 +18854,13 @@ msgid ""
 "time to court martial you so I'll handle this myself. Guards! Kill this "
 "idiot!"
 msgstr ""
+"Att inte lyda en direkt order från en högre officer är förräderi. Jag har "
+"inte tid att ställa dig inför krigsrätt, så jag sköter det här själv. "
+"Vakter! Döda den här idioten!"
 
 #: dialog/ccmandr.msg:110
 msgid "Screw you!"
-msgstr ""
+msgstr "Fan ta dig!"
 
 #: dialog/ccmandr.msg:111
 msgid ""
@@ -18867,44 +18870,47 @@ msgstr ""
 
 #: dialog/ccmandr.msg:112 dialog/ccmandr.msg:114 dialog/ccmandr.msg:116
 msgid "Yes sir!"
-msgstr ""
+msgstr "Ja, sir!"
 
 #: dialog/ccmandr.msg:113
 msgid "Make it quick soldier, I don't have all day to stand around."
-msgstr ""
+msgstr "Gör det snabbt soldat, jag har inte hela dagen på mig att stå här."
 
 #: dialog/ccmandr.msg:115 dialog/ccmandr.msg:124
 msgid "Leave my locker alone or I will dish out some serious pain."
-msgstr ""
+msgstr "Lämna mitt skåp ifred annars kommer jag att göra ditt liv smärtsamt."
 
 #: dialog/ccmandr.msg:117
 msgid ""
 "This base is on alert and I don't recognize you. Show me your papers, "
 "soldier."
 msgstr ""
+"Den här basen är i beredskap och jag känner inte igen dig. Visa mig dina "
+"papper, soldat."
 
 #: dialog/ccmandr.msg:118
 msgid "What papers?"
-msgstr ""
+msgstr "Vilka papper?"
 
 #: dialog/ccmandr.msg:119
 msgid "You blow me!"
-msgstr ""
+msgstr "Dra åt helvete!"
 
 #: dialog/ccmandr.msg:120
 msgid "I don't seem to have them with me..."
-msgstr ""
+msgstr "Jag verkar inte ha dem med mig..."
 
 #: dialog/ccmandr.msg:122
 msgid ""
 "Wrong answer, maggot. You're to carry your papers with you at all times. You"
 " should know that!"
 msgstr ""
+"Fel svar, kryp. Du ska alltid ha dina papper med dig. Det borde du veta!"
 
 #: dialog/ccmandr.msg:123 dialog/dcmetzge.msg:751 dialog/dctyler.msg:303
 #: dialog/gcwooz.msg:705
 msgid "Fuck you."
-msgstr ""
+msgstr "Fan ta dig."
 
 #: dialog/ccmandr.msg:200
 msgid ""
@@ -19047,55 +19053,62 @@ msgstr ""
 
 #: dialog/ccmaster.msg:100
 msgid "Big surprise -- it looks like a guy in power armor."
-msgstr ""
+msgstr "Stor överraskning -- det ser ut som en snubbe i kraftrustning."
 
 #: dialog/ccmaster.msg:101
 msgid "Yep, it's still a guy in power armor."
-msgstr ""
+msgstr "Japp, det är fortfarande en snubbe i kraftrustning."
 
 #: dialog/ccmaster.msg:102
 msgid ""
 "He's got some kind of insignia on his chest that different from any of the others you've seen\n"
 " around here. "
 msgstr ""
+"Han har något slags märke på bröstet som skiljer sig från alla andra du "
+"sett\n"
+" häromkring."
 
 #: dialog/ccmaster.msg:103
 msgid "<Skzzzt-spork> -the armory!"
-msgstr ""
+msgstr "<Skzzzt-spork> -vapenförrådet!"
 
 #: dialog/ccmaster.msg:104
 msgid "What the- <zzzzaaark!>>"
-msgstr ""
+msgstr "Vad i- <zzzzaaark!>>"
 
 #: dialog/ccmaster.msg:105
 msgid ""
 "(So, Sarge sent you. Something about needing power armor. Well, all I got is one in for\n"
 " maintenance. Might have a few problems still, so take it easy. Just sign here.)"
 msgstr ""
+"(Så, Sergeanten skickade dig. Nåt om att behöva en kraftrustning. Tja, allt "
+"jag har är en inne för\n"
+" underhåll. Kan ha några problem fortfarande, så ta det lugnt. Skriv bara "
+"under här.)"
 
 #: dialog/ccmaster.msg:106
 msgid "Uh... Could you repeat that?"
-msgstr ""
+msgstr "Eh... Kan du upprepa det?"
 
 #: dialog/ccmaster.msg:107
 msgid "I think there's something wrong with your suit."
-msgstr ""
+msgstr "Jag tror att det är något fel på din rustning."
 
 #: dialog/ccmaster.msg:108
 msgid "Sure, I'll do that."
-msgstr ""
+msgstr "Visst, det ska jag göra."
 
 #: dialog/ccmaster.msg:109
 msgid "No way. Forget it."
-msgstr ""
+msgstr "Inte en chans. Glöm det."
 
 #: dialog/ccmaster.msg:110
 msgid "You the guy Arch radioed about?"
-msgstr ""
+msgstr "E du snubben Arch ropa' in om?"
 
 #: dialog/ccmaster.msg:111
 msgid "Are you sure you're not the guy?"
-msgstr ""
+msgstr "Är du säker på att du inte är killen?"
 
 #: dialog/ccmaster.msg:112 dialog/ccmaster.msg:130 dialog/ccmaster.msg:134
 #: dialog/ccmaster.msg:167 dialog/dcaddct2.msg:200 dialog/dcbilly.msg:414
@@ -19110,7 +19123,7 @@ msgstr "Vadå?"
 
 #: dialog/ccmaster.msg:115 dialog/ccmaster.msg:119 dialog/fcelrind.msg:103
 msgid "Who are you? What are you doing here?"
-msgstr ""
+msgstr "Vem är du? Vad gör du här?"
 
 #: dialog/ccmaster.msg:116 dialog/ccmaster.msg:120 dialog/dcmetzge.msg:215
 #: dialog/dcmetzge.msg:682 dialog/dcmetzge.msg:711 dialog/dcorphan.msg:201
@@ -19122,7 +19135,7 @@ msgstr "Vad?"
 
 #: dialog/ccmaster.msg:117 dialog/ccmaster.msg:121
 msgid "Uh... I'm new here?"
-msgstr ""
+msgstr "Eh... jag är ny här?"
 
 #: dialog/ccmaster.msg:118 dialog/ccmaster.msg:122
 msgid "Peek-a-boo!"
@@ -19133,63 +19146,70 @@ msgid ""
 "What do you mean? This suit's working fine! You gonna sign the papers or "
 "not?"
 msgstr ""
+"Vad menar du med det? Den här rustningen fungerar bra! Ska du skriva på "
+"papperna eller inte?"
 
 #: dialog/ccmaster.msg:124
 msgid "I'm not understanding a word of this."
-msgstr ""
+msgstr "Jag förstår inte ett ord av det här."
 
 #: dialog/ccmaster.msg:125
 msgid "Your speaker's broken."
-msgstr ""
+msgstr "Din högtalare är trasig."
 
 #: dialog/ccmaster.msg:126 dialog/scratch.msg:104
 msgid "Sure, whatever."
-msgstr ""
+msgstr "Visst."
 
 #: dialog/ccmaster.msg:127
 msgid "To hell with this!"
-msgstr ""
+msgstr "Åt helvete med det här!"
 
 #: dialog/ccmaster.msg:128
 msgid "(What, are you deaf? I said I got a suit; just sign here.)"
-msgstr ""
+msgstr "(Vad, är du döv? Jag sa att jag har en rustning; skriv bara på här.)"
 
 #: dialog/ccmaster.msg:129
 msgid ""
 "Clown, are you? Well, I don't need this. You explain to Sarge why you don't "
 "have a uniform!"
 msgstr ""
+"Är du en clown? Tja, jag behöver inte det här. Förklara för sergeanten "
+"varför du inte har en uniform!"
 
 #: dialog/ccmaster.msg:131
 msgid "Okay, fine. I'll do it."
-msgstr ""
+msgstr "Okej, bra. Jag ska göra det."
 
 #: dialog/ccmaster.msg:132
 msgid "Just forget it, okay?"
-msgstr ""
+msgstr "Glöm det bara, okej?"
 
 #: dialog/ccmaster.msg:133
 msgid ""
 "Your speaker's not broken. I can hear you just fine. Just sign the papers and we can get this\n"
 " done."
 msgstr ""
+"Din högtalare är inte trasig. Jag hör dig alldeles utmärkt. Skriv bara under "
+"papperna så kan vi få det här\n"
+" gjort."
 
 #: dialog/ccmaster.msg:135
 msgid "Fine, I give up!"
-msgstr ""
+msgstr "Okej, jag ger upp!"
 
 #: dialog/ccmaster.msg:136
 msgid "You want me to what? I'm not that kind of person!"
-msgstr ""
+msgstr "Du vill att jag ska göra vadå? Jag är inte den sortens person!"
 
 #: dialog/ccmaster.msg:137
 msgid "Okay, what's your name?"
-msgstr ""
+msgstr "Okej, vad heter du?"
 
 #: dialog/ccmaster.msg:138 dialog/ccmaster.msg:152 dialog/ccmaster.msg:190
 #: dialog/sccarkid.msg:104 dialog/scsalbob.msg:108
 msgid "[Player name]"
-msgstr ""
+msgstr "[Spelarens namn]"
 
 #: dialog/ccmaster.msg:139 dialog/ccmaster.msg:153
 msgid "Pisces?"
@@ -19197,7 +19217,7 @@ msgstr "Fiskarna?"
 
 #: dialog/ccmaster.msg:140
 msgid "I want the power armor."
-msgstr ""
+msgstr "Jag vill ha kraftrustningen."
 
 #: dialog/ccmaster.msg:141 dialog/ccmaster.msg:154
 msgid "Swordfish."
@@ -19205,7 +19225,7 @@ msgstr "Svärdfisk."
 
 #: dialog/ccmaster.msg:142
 msgid "Right. Unit?"
-msgstr ""
+msgstr "Okej. Enhet?"
 
 #: dialog/ccmaster.msg:143 dialog/ccmaster.msg:157 dialog/ccmaster.msg:181
 msgid "Arroyo."
@@ -19213,7 +19233,7 @@ msgstr "Arroyo."
 
 #: dialog/ccmaster.msg:145 dialog/ccmaster.msg:183
 msgid "I got better."
-msgstr ""
+msgstr "Jag blev bättre."
 
 #: dialog/ccmaster.msg:146 dialog/ccmaster.msg:158 dialog/ccmaster.msg:184
 msgid "42."
@@ -19264,19 +19284,19 @@ msgstr "Inte."
 #: dialog/ccmaster.msg:165
 msgid ""
 "Okay, let's make this quick. Take that off and I'll give you a new suit."
-msgstr ""
+msgstr "Okej, nu skyndar vi på. Ta av dig den där så får du en ny kostym."
 
 #: dialog/ccmaster.msg:166
 msgid "You're nothing but static."
-msgstr ""
+msgstr "Jag hör bara sprakande från dig."
 
 #: dialog/ccmaster.msg:169
 msgid "You're gonna off me? I don't think so!"
-msgstr ""
+msgstr "Tänker du döda mig? Jag tror inte det!"
 
 #: dialog/ccmaster.msg:170
 msgid "Oh, well never mind."
-msgstr ""
+msgstr "Åh, ja, glöm det."
 
 #: dialog/ccmaster.msg:171
 msgid "The power armor. Give me the power armor, you moron."
diff --git a/data/text/russian/dialog/gcenc2.msg b/data/text/russian/dialog/gcenc2.msg
index c26853b269..127f5e27ff 100644
--- a/data/text/russian/dialog/gcenc2.msg
+++ b/data/text/russian/dialog/gcenc2.msg
@@ -15,6 +15,6 @@
 {114}{}{Воу, воу, постойте! Почему вы не верите мне? Хоть скажите, что я, по-вашему, натворил?}
 {115}{}{Кто-то взломал компьютерную сеть Анклава с терминала реактора Посейдон Ойл. Мы пытаемся разыскать его.}
 {116}{}{Взломал что?! Ну, это не мое. Я всего лишь дикарь. Я даже не знаю, как использовать -- как вы это называете? - Ком-пю-теры.}
-{200}{}{Гекко?  Черт, нет, вы разве не знаете, что это место кишит кривомордыми гулями? Мне и так приходится смотреть за моим дядей Ленни. А почему вы спросили?}
+{200}{}{Гекко? Черт, нет, вы разве не знаете, что это место кишит кривомордыми гулями? Мне и так приходится смотреть за моим дядей Ленни. А почему вы спросили?}
 {201}{}{Ургх?}
 {202}{}{Моя убивать плохих людей!}
diff --git a/data/text/russian/dialog/generic.msg b/data/text/russian/dialog/generic.msg
index 40304366ac..1d1e7283ee 100644
--- a/data/text/russian/dialog/generic.msg
+++ b/data/text/russian/dialog/generic.msg
@@ -208,7 +208,7 @@
 {3925}{}{Эй, ты! Что ты там делаешь?}
 {3926}{}{Тебе нечего здесь делать!}
 {3927}{}{Если ты думаешь, что я тут стою для мебели, подумай еще раз.}
-{3928}{}{Если я правильно понимаю, что ты хочешь сделать, даже и не пытайся.}
+{3928}{}{Ты лучше не замышляй то, что я думаю, чужак.}
 {3929}{}{Что? Тебе вправду казалось, что я тебя не замечу? Убирайся отсюда!}
 {3950}{}{}
 {3975}{}{}
diff --git a/data/text/swedish/dialog/ccmandr.msg b/data/text/swedish/dialog/ccmandr.msg
index 2473092029..7309ea696d 100644
--- a/data/text/swedish/dialog/ccmandr.msg
+++ b/data/text/swedish/dialog/ccmandr.msg
@@ -1,29 +1,29 @@
 {100}{}{You see someone in power armor. }
-{101}{}{You see the Navarro base Commander.}
+{101}{}{Du ser befälhavaren för Navarro-basen.}
 {102}{}{You see someone wearing power armor of an unusual design. There is an insignia on the breastplate that you are unfamiliar with.}
-{103}{}{Who the hell are you guys... Alert! Intruders on the base!}
+{103}{}{Vilka fan är ni... Varning! Inkräktare på basen!}
 {104}{}{I don't have time to chitchat with the grunts. You're dismissed.}
-{105}{}{Time to die.}
+{105}{}{Dags att dö.}
 {106}{}{Okej.}
 {107}{}{I told you I don't have time for you. Leave this office and do not come back here unless I send for you. Dismissed!}
-{108}{}{Disobeying a direct order of a superior officer is treason. I don't have time to court martial you so I'll handle this myself. Guards! Kill this idiot!}
+{108}{}{Att inte lyda en direkt order från en högre officer är förräderi. Jag har inte tid att ställa dig inför krigsrätt, så jag sköter det här själv. Vakter! Döda den här idioten!}
 {109}{}{Okej.}
-{110}{}{Screw you!}
+{110}{}{Fan ta dig!}
 {111}{}{The Fob is in the locker over there. Have the duty officer contact me once it's secured. Dismissed!}
-{112}{}{Yes sir!}
-{113}{}{Make it quick soldier, I don't have all day to stand around.}
-{114}{}{Yes sir!}
-{115}{}{Leave my locker alone or I will dish out some serious pain.}
-{116}{}{Yes sir!}
-{117}{}{This base is on alert and I don't recognize you. Show me your papers, soldier.}
-{118}{}{What papers?}
-{119}{}{You blow me!}
-{120}{}{I don't seem to have them with me...}
+{112}{}{Ja, sir!}
+{113}{}{Gör det snabbt soldat, jag har inte hela dagen på mig att stå här.}
+{114}{}{Ja, sir!}
+{115}{}{Lämna mitt skåp ifred annars kommer jag att göra ditt liv smärtsamt.}
+{116}{}{Ja, sir!}
+{117}{}{Den här basen är i beredskap och jag känner inte igen dig. Visa mig dina papper, soldat.}
+{118}{}{Vilka papper?}
+{119}{}{Dra åt helvete!}
+{120}{}{Jag verkar inte ha dem med mig...}
 {121}{}{Papers? I've got your papers right here!}
-{122}{}{Wrong answer, maggot. You're to carry your papers with you at all times. You should know that!}
-{123}{}{Fuck you.}
-{124}{}{Leave my locker alone or I will dish out some serious pain.}
-{125}{}{Time to die.}
+{122}{}{Fel svar, kryp. Du ska alltid ha dina papper med dig. Det borde du veta!}
+{123}{}{Fan ta dig.}
+{124}{}{Lämna mitt skåp ifred annars kommer jag att göra ditt liv smärtsamt.}
+{125}{}{Dags att dö.}
 {200}{}{Alright, let's get this over with--I don't like muties stinking up my office, and I got shit to do. Do you work
  for the Salvatores? }
 {201}{}{None of your business, asshole.}
diff --git a/data/text/swedish/dialog/ccmaster.msg b/data/text/swedish/dialog/ccmaster.msg
index 9f91d42b4e..32ea96c43b 100644
--- a/data/text/swedish/dialog/ccmaster.msg
+++ b/data/text/swedish/dialog/ccmaster.msg
@@ -1,59 +1,59 @@
-{100}{}{Big surprise -- it looks like a guy in power armor.}
-{101}{}{Yep, it's still a guy in power armor.}
-{102}{}{He's got some kind of insignia on his chest that different from any of the others you've seen
- around here. }
-{103}{}{<Skzzzt-spork> -the armory!}
-{104}{}{What the- <zzzzaaark!>>}
-{105}{}{(So, Sarge sent you. Something about needing power armor. Well, all I got is one in for
- maintenance. Might have a few problems still, so take it easy. Just sign here.)}
-{106}{}{Uh... Could you repeat that?}
-{107}{}{I think there's something wrong with your suit.}
-{108}{}{Sure, I'll do that.}
-{109}{}{No way. Forget it.}
-{110}{}{You the guy Arch radioed about?}
-{111}{}{Are you sure you're not the guy?}
+{100}{}{Stor överraskning -- det ser ut som en snubbe i kraftrustning.}
+{101}{}{Japp, det är fortfarande en snubbe i kraftrustning.}
+{102}{}{Han har något slags märke på bröstet som skiljer sig från alla andra du sett
+ häromkring.}
+{103}{}{<Skzzzt-spork> -vapenförrådet!}
+{104}{}{Vad i- <zzzzaaark!>>}
+{105}{}{(Så, Sergeanten skickade dig. Nåt om att behöva en kraftrustning. Tja, allt jag har är en inne för
+ underhåll. Kan ha några problem fortfarande, så ta det lugnt. Skriv bara under här.)}
+{106}{}{Eh... Kan du upprepa det?}
+{107}{}{Jag tror att det är något fel på din rustning.}
+{108}{}{Visst, det ska jag göra.}
+{109}{}{Inte en chans. Glöm det.}
+{110}{}{E du snubben Arch ropa' in om?}
+{111}{}{Är du säker på att du inte är killen?}
 {112}{}{Vadå?}
 {113}{}{Ja.}
 {114}{}{Nej.}
-{115}{}{Who are you? What are you doing here?}
+{115}{}{Vem är du? Vad gör du här?}
 {116}{}{Vad?}
-{117}{}{Uh... I'm new here?}
+{117}{}{Eh... jag är ny här?}
 {118}{}{Tittut!}
-{119}{}{Who are you? What are you doing here?}
+{119}{}{Vem är du? Vad gör du här?}
 {120}{}{Vad?}
-{121}{}{Uh... I'm new here?}
+{121}{}{Eh... jag är ny här?}
 {122}{}{Tittut!}
-{123}{}{What do you mean? This suit's working fine! You gonna sign the papers or not?}
-{124}{}{I'm not understanding a word of this.}
-{125}{}{Your speaker's broken.}
-{126}{}{Sure, whatever.}
-{127}{}{To hell with this!}
-{128}{}{(What, are you deaf? I said I got a suit; just sign here.)}
-{129}{}{Clown, are you? Well, I don't need this. You explain to Sarge why you don't have a uniform!}
+{123}{}{Vad menar du med det? Den här rustningen fungerar bra! Ska du skriva på papperna eller inte?}
+{124}{}{Jag förstår inte ett ord av det här.}
+{125}{}{Din högtalare är trasig.}
+{126}{}{Visst.}
+{127}{}{Åt helvete med det här!}
+{128}{}{(Vad, är du döv? Jag sa att jag har en rustning; skriv bara på här.)}
+{129}{}{Är du en clown? Tja, jag behöver inte det här. Förklara för sergeanten varför du inte har en uniform!}
 {130}{}{Vadå?}
-{131}{}{Okay, fine. I'll do it.}
-{132}{}{Just forget it, okay?}
-{133}{}{Your speaker's not broken. I can hear you just fine. Just sign the papers and we can get this
- done.}
+{131}{}{Okej, bra. Jag ska göra det.}
+{132}{}{Glöm det bara, okej?}
+{133}{}{Din högtalare är inte trasig. Jag hör dig alldeles utmärkt. Skriv bara under papperna så kan vi få det här
+ gjort.}
 {134}{}{Vadå?}
-{135}{}{Fine, I give up!}
-{136}{}{You want me to what? I'm not that kind of person!}
-{137}{}{Okay, what's your name?}
-{138}{}{[Player name]}
+{135}{}{Okej, jag ger upp!}
+{136}{}{Du vill att jag ska göra vadå? Jag är inte den sortens person!}
+{137}{}{Okej, vad heter du?}
+{138}{}{[Spelarens namn]}
 {139}{}{Fiskarna?}
-{140}{}{I want the power armor.}
+{140}{}{Jag vill ha kraftrustningen.}
 {141}{}{Svärdfisk.}
-{142}{}{Right. Unit?}
+{142}{}{Okej. Enhet?}
 {143}{}{Arroyo.}
 {144}{}{Näpp.}
-{145}{}{I got better.}
+{145}{}{Jag blev bättre.}
 {146}{}{42.}
 {147}{}{That with an S or a C?}
 {148}{}{Ja.}
 {149}{}{Nej.}
 {150}{}{I don't know.}
 {151}{}{You'll get the damn armor when I'm good and ready! Now, answer the question.}
-{152}{}{[Player name]}
+{152}{}{[Spelarens namn]}
 {153}{}{Fiskarna?}
 {154}{}{Svärdfisk.}
 {155}{}{Arroy-- Wait a minute! We just hit that place. You're a damn tribal! Guards!}
@@ -67,12 +67,12 @@
 {162}{}{Ja.}
 {163}{}{Like a fish in water.}
 {164}{}{Inte.}
-{165}{}{Okay, let's make this quick. Take that off and I'll give you a new suit.}
-{166}{}{You're nothing but static.}
+{165}{}{Okej, nu skyndar vi på. Ta av dig den där så får du en ny kostym.}
+{166}{}{Jag hör bara sprakande från dig.}
 {167}{}{Vadå?}
 {168}{}{Okej.}
-{169}{}{You're gonna off me? I don't think so!}
-{170}{}{Oh, well never mind.}
+{169}{}{Tänker du döda mig? Jag tror inte det!}
+{170}{}{Åh, ja, glöm det.}
 {171}{}{The power armor. Give me the power armor, you moron.}
 {172}{}{Okej.}
 {173}{}{I already made the deal. I'm not giving you any more.}
@@ -85,7 +85,7 @@
 {180}{}{Right, J. Okay, Unit?}
 {181}{}{Arroyo.}
 {182}{}{Näpp.}
-{183}{}{I got better.}
+{183}{}{Jag blev bättre.}
 {184}{}{42.}
 {185}{}{You deaf? Who are you?}
 {186}{}{I'm the new guy?}
@@ -93,7 +93,7 @@
 {188}{}{New guy, eh? Suppose you want your issue. Why don't anybody ever tell me these things? What's
  your name?}
 {189}{}{Huh? You ain't nothing but static.}
-{190}{}{[Player name]}
+{190}{}{[Spelarens namn]}
 {191}{}{Not if I shoot first!}
 {192}{}{Wait a minute -- you're not one of us! GUARDS!}
 {193}{}{Look soldier, I already gave you your gear, so get on out of here.}
diff --git a/data/text/swedish/dialog/ccqmstr.msg b/data/text/swedish/dialog/ccqmstr.msg
index e47e318cdc..7eb087e01e 100644
--- a/data/text/swedish/dialog/ccqmstr.msg
+++ b/data/text/swedish/dialog/ccqmstr.msg
@@ -2,7 +2,7 @@
 {101}{}{You see the Quartermaster.}
 {102}{}{You see someone wearing power armor of an unusual design.
  There is an insignia on the breastplate that you are unfamiliar with.}
-{103}{}{Who the hell are you guys... Alert! Intruders on the base!}
+{103}{}{Vilka fan är ni... Varning! Inkräktare på basen!}
 {104}{}{What the... I can see why you're here. You obviously want
  to get rid of that antique suit you're wearing.}
 {105}{}{Why are you out of uniform, soldier?}
diff --git a/data/text/swedish/dialog/dcmetzge.msg b/data/text/swedish/dialog/dcmetzge.msg
index f958b04b9a..3825500a32 100644
--- a/data/text/swedish/dialog/dcmetzge.msg
+++ b/data/text/swedish/dialog/dcmetzge.msg
@@ -263,7 +263,7 @@
 {741}{}{Bring it on!}
 {742}{}{I'm not getting out of this am I?}
 {750}{}{Oh, but this will be fun. Trust me.}
-{751}{}{Fuck you.}
+{751}{}{Fan ta dig.}
 {752}{}{Uh, okay.}
 {800}{}{You've killed the leader of the Slave Guild.}
 {900}{}{What you see is what you get. If you don't like my merchandise, then get the fuck out of my face and stop wasting my time.}
diff --git a/data/text/swedish/dialog/dctyler.msg b/data/text/swedish/dialog/dctyler.msg
index bc141976a1..5cdf9cf4dc 100644
--- a/data/text/swedish/dialog/dctyler.msg
+++ b/data/text/swedish/dialog/dctyler.msg
@@ -48,7 +48,7 @@
 {300}{}{Beat it, tough guy, before I get angry on Your face.}
 {301}{}{Beat it, bitch. Metzger wouldn't have sent a woman anyhow, so take a hike.}
 {302}{}{Bitch? I'll show you what this bitch can do.}
-{303}{}{Fuck you.}
+{303}{}{Fan ta dig.}
 {304}{}{[Lämna]}
 {310}{}{Beat it.}
 {320}{}{That's nice. Me Tyler. Me go bye bye.}
diff --git a/data/text/swedish/dialog/fcelrind.msg b/data/text/swedish/dialog/fcelrind.msg
index feb8521f1b..63f1b34985 100644
--- a/data/text/swedish/dialog/fcelrind.msg
+++ b/data/text/swedish/dialog/fcelrind.msg
@@ -1,7 +1,7 @@
 {100}{}{You see someone in a floppy robe.}
 {101}{}{It's another robed Hubologist.}
 {102}{}{It appears to be someone wearing a robe.}
-{103}{}{Who are you? What are you doing here?}
+{103}{}{Vem är du? Vad gör du här?}
 {104}{}{You're not supposed to be here, are you?}
 {105}{}{Look! Rim meat!}
 {106}{}{Hey! Who let the rim meat in?}
diff --git a/data/text/swedish/dialog/gcwooz.msg b/data/text/swedish/dialog/gcwooz.msg
index ca3377cde4..c995248ed8 100644
--- a/data/text/swedish/dialog/gcwooz.msg
+++ b/data/text/swedish/dialog/gcwooz.msg
@@ -220,7 +220,7 @@
 {702}{}{I need a ruling on that!}
 {703}{}{Kick me in the jimmy.}
 {704}{}{Hi, shills.}
-{705}{}{Fuck you.}
+{705}{}{Fan ta dig.}
 {706}{}{I wouldn't shit you on this one.}
 {707}{}{Let's play Tragic.}
 {708}{}{I am the worst Tragic player in the world.}
diff --git a/data/text/swedish/dialog/sccarkid.msg b/data/text/swedish/dialog/sccarkid.msg
index 44d86e40c7..138284910e 100644
--- a/data/text/swedish/dialog/sccarkid.msg
+++ b/data/text/swedish/dialog/sccarkid.msg
@@ -2,7 +2,7 @@
 {101}{}{It's Vice-President Carlson's kid.}
 {102}{}{Looks like a spoiled little runt. Fat, too.}
 {103}{}{My dad's Vice-President Carlson, so you better treat me nice! Who are you?}
-{104}{}{[Player name]}
+{104}{}{[Spelarens namn]}
 {105}{}{I'm one of your dad's guards.}
 {106}{}{Where's your dad?}
 {107}{}{See this knife? I've gutted little kids nicer than you.}
diff --git a/data/text/swedish/dialog/scratch.msg b/data/text/swedish/dialog/scratch.msg
index 035cf1fd93..8047636663 100644
--- a/data/text/swedish/dialog/scratch.msg
+++ b/data/text/swedish/dialog/scratch.msg
@@ -2,7 +2,7 @@
 {101}{}{You see Ratch, probably picking at some lice.}
 {102}{}{It could be a human. It might be a mutant. All you can tell for sure is that it smells really, really bad.}
 {103}{}{Junk for sale, junk for sale. Look it over, make me an offer.}
-{104}{}{Sure, whatever.}
+{104}{}{Visst.}
 {105}{}{Uh... huh.}
 {106}{}{So what's for sale?}
 {107}{}{You look like you're good with your hands. You do have hands, don't you?}
diff --git a/data/text/swedish/dialog/scsalbob.msg b/data/text/swedish/dialog/scsalbob.msg
index d25ca49975..a833363d72 100644
--- a/data/text/swedish/dialog/scsalbob.msg
+++ b/data/text/swedish/dialog/scsalbob.msg
@@ -6,7 +6,7 @@
 {105}{}{Vem är du?}
 {106}{}{Name's Bob. Saltbeef Bob, yep. How about you?}
 {107}{}{What'd you say your name was again, stranger? I'm Saltbeef Bob.}
-{108}{}{[Player name]}
+{108}{}{[Spelarens namn]}
 {109}{}{Saltbeef? What kind of name is that?}
 {110}{}{What are you doing here?}
 {111}{}{That's a right fine name, yep. Say, you wouldn't have a drink on ya, pardner?}
diff --git a/scripts_src/brokhill/hcmarcus.ssl b/scripts_src/brokhill/hcmarcus.ssl
index 05669b67c8..9b97bbabbe 100644
--- a/scripts_src/brokhill/hcmarcus.ssl
+++ b/scripts_src/brokhill/hcmarcus.ssl
@@ -29,7 +29,6 @@
 #include "../headers/define.h"
 #include "../headers/broken.h"
 #include "../headers/broken1.h"
-#include "../headers/newr1.h" //added by killap
 
 #define NAME                    SCRIPT_HCMARCUS
 #define TOWN_REP_VAR            (GVAR_TOWN_REP_BROKEN_HILLS)
@@ -52,7 +51,6 @@ procedure description_p_proc;
 procedure use_skill_on_p_proc;
 procedure use_obj_on_p_proc;
 procedure damage_p_proc;
-procedure map_update_p_proc;
 procedure map_enter_p_proc;
 procedure timed_event_p_proc;
 procedure combat;
@@ -273,7 +271,7 @@ procedure map_enter_p_proc begin
 
    if (Marcus_In_Party) then begin
       Perform_Critter_Float := 1;
-      add_timer_event( self_obj, game_ticks( random(40, 50) ), 1);
+      flush_add_timer_event_sec(self_obj, random(40, 50), 1);
    end
    else begin
       Perform_Critter_Float := 0;
@@ -287,15 +285,11 @@ procedure map_enter_p_proc begin
    end
 end
 
-procedure map_update_p_proc begin
-end
-
 procedure push_p_proc begin
    call Node2001;
 end
 
 procedure timed_event_p_proc begin
-   variable count;
    // 1 - Standard Floats
    if( fixed_param == 1 ) then begin
       if( ( not( combat_is_initialized ) ) and
@@ -323,35 +317,35 @@ procedure timed_event_p_proc begin
                call Node2015;
          end
       end
-      add_timer_event( self_obj, game_ticks( random(100, 125) ), 1); //edit by killap - was (40,50)
+      flush_add_timer_event_sec(self_obj, random(60, 90), 1); //edit by killap - was (40,50)
    end else if ( fixed_param == 2 ) then begin
       if (series == 1) then begin
-            series := 2;
-            floater(40001);
-            add_timer_event(self_obj,game_ticks(5),2);
+         series := 2;
+         floater(40001);
+         add_timer_event(self_obj,game_ticks(5),2);
       end else if (series == 2) then begin
-            series := 3;
-            float_msg(Chad_Ptr, mstr(40002), FLOAT_MSG_NORMAL);
-            add_timer_event(self_obj,game_ticks(3),2);
+         series := 3;
+         float_msg(Chad_Ptr, mstr(40002), FLOAT_MSG_NORMAL);
+         add_timer_event(self_obj,game_ticks(3),2);
       end else if (series == 3) then begin
-            series := 0;
-            gfade_out(600);
-            game_ui_enable;
-            move_to(self_obj, 18284, 0 );
-            move_to(dude_obj, 18287, 0 );
-            reg_anim_clear( self_obj );
-            self_rotate(3);
-            //anim(self_obj, ANIMATE_ROTATION, 0 );
-            call Put_Chad_In_Jail;
-            gfade_in(600);
-            floater(40000);
-            display_msg(mstr(40003));
-            give_xp(1500);
-            inc_general_rep(5);
-            inc_global_var_amt(GVAR_TOWN_REP_BROKEN_HILLS,5);
+         series := 0;
+         gfade_out(600);
+         game_ui_enable;
+         move_to(self_obj, 18284, 0 );
+         move_to(dude_obj, 18287, 0 );
+         reg_anim_clear( self_obj );
+         self_rotate(3);
+         //anim(self_obj, ANIMATE_ROTATION, 0 );
+         call Put_Chad_In_Jail;
+         gfade_in(600);
+         floater(40000);
+         display_msg(mstr(40003));
+         give_xp(1500);
+         inc_general_rep(5);
+         inc_global_var_amt(GVAR_TOWN_REP_BROKEN_HILLS,5);
       end
-  end
-  //end added
+   end
+   //end added
 end
 
 /* Every heartbeat that the critter gets, this procedure will be called. Anything from
@@ -414,7 +408,6 @@ end
    written by designers are placed in here. Additionally, Reactions are generated and
    stored which affects player interactions. */
 procedure talk_p_proc begin
-
    Evil_Critter:=0;
    Slavery_Tolerant:=SLAVE_INTOLERANT;
    Karma_Perception:=KARMA_PERCEPTION3;
diff --git a/scripts_src/den/dcvic.ssl b/scripts_src/den/dcvic.ssl
index 86bebabf4b..a4f4ab5d96 100644
--- a/scripts_src/den/dcvic.ssl
+++ b/scripts_src/den/dcvic.ssl
@@ -25,7 +25,6 @@
 #include "../headers/command.h"
 #include "../headers/modreact.h"
 #include "../headers/den.h"
-#include "../headers/newr1.h" //added by killap
 
 /* Standard Script Procedures */
 procedure start;
@@ -216,7 +215,7 @@ procedure timed_event_p_proc begin
             end
          end
       end
-      flush_add_timer_event_sec(self_obj, random(45, 90), timed_event_float); //edit by killap - was (15,30)
+      flush_add_timer_event_sec(self_obj, random(60, 90), timed_event_float); //edit by killap - was (15,30)
    end
    else if (fixed_param == TIMER_ENSURE_ANIM) then begin
       if not anim_busy(self_obj) then begin
@@ -243,7 +242,7 @@ procedure timed_event_p_proc begin
             end
          end
       end
-         add_timer_event(self_obj, game_ticks(1), TIMER_ENSURE_ANIM);
+      add_timer_event(self_obj, game_ticks(1), TIMER_ENSURE_ANIM);
    end
 end
 
diff --git a/scripts_src/epa/epac10.ssl b/scripts_src/epa/epac10.ssl
index c7d88ecf23..616adc8197 100644
--- a/scripts_src/epa/epac10.ssl
+++ b/scripts_src/epa/epac10.ssl
@@ -24,7 +24,6 @@
 
 #include "../headers/command.h"
 #include "../headers/modreact.h"
-#include "../headers/newr1.h"
 #include "../headers/epasl.h"
 
 #define PARTY_NODE_X                   Node1000
@@ -308,23 +307,23 @@ procedure use_obj_on_p_proc begin
    end
 
    if (Dex_In_Party) then begin
-         if ( (obj_pid(obj_being_used_with) == PID_FIRST_AID_KIT) or
-            (obj_pid(obj_being_used_with) == PID_DOCTORS_BAG) or
-            (obj_pid(obj_being_used_with) == PID_RADAWAY) or
-            (obj_pid(obj_being_used_with) == PID_ANTIDOTE) or
-            (obj_pid(obj_being_used_with) == PID_STIMPAK) or
-            (obj_pid(obj_being_used_with) == PID_SUPER_STIMPAK) ) then
-            call Node2009;
-         else if( (obj_pid(obj_being_used_with) == PID_BEER ) or
-            (obj_pid(obj_being_used_with) == PID_BOOZE ) or
-            (obj_pid(obj_being_used_with) == PID_ROT_GUT ) or
-            (obj_pid(obj_being_used_with) == PID_ROENTGEN_RUM ) or
-            (obj_pid(obj_being_used_with) == PID_GAMMA_GULP_BEER ) or
-            ( obj_pid(obj_being_used_with) == PID_PSYCHO ) or
-            ( obj_pid(obj_being_used_with) == PID_BUFFOUT ) or
-            ( obj_pid(obj_being_used_with) == PID_MENTATS ) or
-            ( obj_pid(obj_being_used_with) == PID_JET ) ) then
-            call Node2003;
+      if ( (obj_pid(obj_being_used_with) == PID_FIRST_AID_KIT) or
+         (obj_pid(obj_being_used_with) == PID_DOCTORS_BAG) or
+         (obj_pid(obj_being_used_with) == PID_RADAWAY) or
+         (obj_pid(obj_being_used_with) == PID_ANTIDOTE) or
+         (obj_pid(obj_being_used_with) == PID_STIMPAK) or
+         (obj_pid(obj_being_used_with) == PID_SUPER_STIMPAK) ) then
+         call Node2009;
+      else if( (obj_pid(obj_being_used_with) == PID_BEER ) or
+         (obj_pid(obj_being_used_with) == PID_BOOZE ) or
+         (obj_pid(obj_being_used_with) == PID_ROT_GUT ) or
+         (obj_pid(obj_being_used_with) == PID_ROENTGEN_RUM ) or
+         (obj_pid(obj_being_used_with) == PID_GAMMA_GULP_BEER ) or
+         (obj_pid(obj_being_used_with) == PID_PSYCHO) or
+         (obj_pid(obj_being_used_with) == PID_BUFFOUT) or
+         (obj_pid(obj_being_used_with) == PID_MENTATS) or
+         (obj_pid(obj_being_used_with) == PID_JET) ) then
+         call Node2003;
    end
 
 end
@@ -478,47 +477,46 @@ procedure Node902 begin
 end
 
 procedure timed_event_p_proc begin
- if (self_visible) then begin
-   if (combat_is_initialized == false) then begin
-      if (Dex_In_Party == false) then begin
-      //blah
-      end else begin
-         if (party_healed_bad) then begin
-            call Node2001;
-         end else if (self_is_poisoned) then begin
-            call Node2006;
-         end else if (self_rads > 0) then begin
-            call Node2002;
-         end else if (Is_Crippled(self_obj)) then begin
-            call Node2007;
-         end else if (Is_Blind(self_obj)) then begin
-            call Node2008;
-         end else if ( (Sulik_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2100;
-         end else if ( (Vic_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2101;
-         end else if ( (Miria_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2102;
-         end else if ( (Davin_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2103;
-         end else if ( (MacRae_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2104;
-         end else if ( (Lenny_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2105;
-         end else if ( (Marcus_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2106;
-         end else if ( (Myron_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2107;
-         end else if ( (Goris_In_Party) and (random(1,2) == 2) ) then begin
-            call Node2108;
+   if (self_visible) then begin
+      if (combat_is_initialized == false) then begin
+         if (Dex_In_Party == false) then begin
+         //blah
          end else begin
-            call Node2000;
+            if (party_healed_bad) then begin
+               call Node2001;
+            end else if (self_is_poisoned) then begin
+               call Node2006;
+            end else if (self_rads > 0) then begin
+               call Node2002;
+            end else if (Is_Crippled(self_obj)) then begin
+               call Node2007;
+            end else if (Is_Blind(self_obj)) then begin
+               call Node2008;
+            end else if ( (Sulik_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2100;
+            end else if ( (Vic_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2101;
+            end else if ( (Miria_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2102;
+            end else if ( (Davin_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2103;
+            end else if ( (MacRae_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2104;
+            end else if ( (Lenny_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2105;
+            end else if ( (Marcus_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2106;
+            end else if ( (Myron_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2107;
+            end else if ( (Goris_In_Party) and (random(1,2) == 2) ) then begin
+               call Node2108;
+            end else begin
+               call Node2000;
+            end
          end
       end
    end
- end
-
- flush_add_timer_event_sec(self_obj, random(90, 120), 1);
+   flush_add_timer_event_sec(self_obj, random(60, 90), 1);
 end
 
 procedure Node000 begin
diff --git a/scripts_src/epa/epac11.ssl b/scripts_src/epa/epac11.ssl
index e165ea73ba..ffd2218088 100644
--- a/scripts_src/epa/epac11.ssl
+++ b/scripts_src/epa/epac11.ssl
@@ -5,7 +5,6 @@
 #define SCRIPT_REALNAME "epac11"
 #include "../headers/define.h"
 #include "../headers/epamain.h"
-#include "../headers/newr1.h" //added by killap
 #include "../headers/epasl.h"
 
 #define NAME                    SCRIPT_EPAC11          //Script name from scripts.h
@@ -158,8 +157,7 @@ procedure description_p_proc begin
   display_msg(mstr(101));
 end
 
-procedure use_skill_on_p_proc
-begin
+procedure use_skill_on_p_proc begin
 end
 
 procedure use_obj_on_p_proc begin
@@ -171,8 +169,7 @@ procedure use_obj_on_p_proc begin
 
 end
 
-procedure damage_p_proc
-begin
+procedure damage_p_proc begin
 end
 
 procedure map_enter_p_proc begin
@@ -583,34 +580,34 @@ procedure Node5004 begin
 end
 
 procedure timed_event_p_proc begin
- if (self_visible) then begin
-   if (combat_is_initialized == false) then begin
-      if (Cat_Jules_In_Party == false) then begin
-      //blah
-      end else begin
-         if (party_healed_bad) then begin
-            call Node5000;
-         end else if (self_is_poisoned) then begin
-            call Node5001;
-         end else if (self_rads > 0) then begin
-            call Node5002;
-         end else if (Is_Crippled(self_obj)) then begin
-            call Node5003;
-         end else if (Is_Blind(self_obj)) then begin
-            call Node5004;
-         end else if ( (Myron_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3000;
-         end else if ( (Sulik_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3001;
-         end else if ( (Lenny_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3002;
-         end else if ( (Marcus_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3003;
+   if (self_visible) then begin
+      if (combat_is_initialized == false) then begin
+         if (Cat_Jules_In_Party == false) then begin
+         //blah
          end else begin
-            call Node3500;
+            if (party_healed_bad) then begin
+               call Node5000;
+            end else if (self_is_poisoned) then begin
+               call Node5001;
+            end else if (self_rads > 0) then begin
+               call Node5002;
+            end else if (Is_Crippled(self_obj)) then begin
+               call Node5003;
+            end else if (Is_Blind(self_obj)) then begin
+               call Node5004;
+            end else if ( (Myron_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3000;
+            end else if ( (Sulik_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3001;
+            end else if ( (Lenny_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3002;
+            end else if ( (Marcus_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3003;
+            end else begin
+               call Node3500;
+            end
          end
       end
    end
- end
- flush_add_timer_event_sec(self_obj, random(90, 120), 1);
+   flush_add_timer_event_sec(self_obj, random(60, 90), 1);
 end
diff --git a/scripts_src/epa/epac12.ssl b/scripts_src/epa/epac12.ssl
index a1b85520bb..3c977fe519 100644
--- a/scripts_src/epa/epac12.ssl
+++ b/scripts_src/epa/epac12.ssl
@@ -18,7 +18,6 @@
 #define SCRIPT_REALNAME "epac12"
 #include "../headers/define.h"
 #include "../headers/epamain.h"
-#include "../headers/newr1.h" //added by killap
 #include "../headers/epasl.h"
 
 #define NAME                    SCRIPT_EPAC12               //Script name from scripts.h
@@ -306,8 +305,7 @@ procedure description_p_proc begin
   display_msg(mstr(random(102,104)));
 end
 
-procedure use_skill_on_p_proc
-begin
+procedure use_skill_on_p_proc begin
 end
 
 procedure use_obj_on_p_proc begin
@@ -318,33 +316,32 @@ procedure use_obj_on_p_proc begin
    end
 
    if (Kitsune_In_Party) then begin
-         if ( (obj_pid(obj_being_used_with) == PID_FIRST_AID_KIT) or
-            (obj_pid(obj_being_used_with) == PID_DOCTORS_BAG) or
-            (obj_pid(obj_being_used_with) == PID_RADAWAY) or
-            (obj_pid(obj_being_used_with) == PID_ANTIDOTE) or
-            (obj_pid(obj_being_used_with) == PID_STIMPAK) or
-            (obj_pid(obj_being_used_with) == PID_SUPER_STIMPAK) ) then
-            call Node4000;
-         else if( (obj_pid(obj_being_used_with) == PID_BEER ) or
-            (obj_pid(obj_being_used_with) == PID_BOOZE ) or
-            (obj_pid(obj_being_used_with) == PID_ROT_GUT ) or
-            (obj_pid(obj_being_used_with) == PID_ROENTGEN_RUM ) or
-            (obj_pid(obj_being_used_with) == PID_GAMMA_GULP_BEER ) ) then
-            call Node4001;
-         else if ( obj_pid(obj_being_used_with) == PID_PSYCHO ) then
-            call Node4002;
-         else if ( obj_pid(obj_being_used_with) == PID_BUFFOUT ) then
-            call Node4003;
-         else if ( obj_pid(obj_being_used_with) == PID_MENTATS ) then
-            call Node4004;
-         else if ( obj_pid(obj_being_used_with) == PID_JET ) then
-            call Node4005;
+      if ( (obj_pid(obj_being_used_with) == PID_FIRST_AID_KIT) or
+         (obj_pid(obj_being_used_with) == PID_DOCTORS_BAG) or
+         (obj_pid(obj_being_used_with) == PID_RADAWAY) or
+         (obj_pid(obj_being_used_with) == PID_ANTIDOTE) or
+         (obj_pid(obj_being_used_with) == PID_STIMPAK) or
+         (obj_pid(obj_being_used_with) == PID_SUPER_STIMPAK) ) then
+         call Node4000;
+      else if( (obj_pid(obj_being_used_with) == PID_BEER) or
+         (obj_pid(obj_being_used_with) == PID_BOOZE) or
+         (obj_pid(obj_being_used_with) == PID_ROT_GUT) or
+         (obj_pid(obj_being_used_with) == PID_ROENTGEN_RUM) or
+         (obj_pid(obj_being_used_with) == PID_GAMMA_GULP_BEER) ) then
+         call Node4001;
+      else if (obj_pid(obj_being_used_with) == PID_PSYCHO) then
+         call Node4002;
+      else if (obj_pid(obj_being_used_with) == PID_BUFFOUT) then
+         call Node4003;
+      else if (obj_pid(obj_being_used_with) == PID_MENTATS) then
+         call Node4004;
+      else if (obj_pid(obj_being_used_with) == PID_JET) then
+         call Node4005;
    end
 
 end
 
-procedure damage_p_proc
-begin
+procedure damage_p_proc begin
 end
 
 procedure map_enter_p_proc begin
@@ -394,14 +391,14 @@ procedure kill_p_proc begin
 end
 
 procedure talk_p_proc begin
-  if (local_var(LVAR_Herebefore) == 0) then begin
+   if (local_var(LVAR_Herebefore) == 0) then begin
       set_local_var(LVAR_Herebefore,1);
       start_gdialog(NAME,self_obj,4,-1,-1);
       gSay_Start;
          call Node001;
       gSay_End;
       end_dialogue;
-  end else begin
+   end else begin
       if ((Kitsune_In_Party) or (party_is_waiting)) then begin
          start_gdialog(NAME,self_obj,4,-1,-1);
          gSay_Start;
@@ -415,15 +412,15 @@ procedure talk_p_proc begin
          gSay_End;
          end_dialogue;
       end
-  end
+   end
 
-  if (Delete_Self == 1) then
-   destroy_object(self_obj);
+   if (Delete_Self == 1) then
+      destroy_object(self_obj);
 
-  if (local_var(LVAR_Kill_NPC) == 1) then begin
+   if (local_var(LVAR_Kill_NPC) == 1) then begin
       set_self_visible; //visi
       call kill_p_proc;
-  end
+   end
 end
 
 procedure Node001 begin
@@ -434,8 +431,8 @@ end
 procedure Node002 begin
    if (map_var(MVAR_Kitsune_Free) == 2) then begin
       Reply(5000);
-	   NOption(5001,Node999,004);
-	   set_local_var(LVAR_Kill_NPC,1);
+      NOption(5001,Node999,004);
+      set_local_var(LVAR_Kill_NPC,1);
       destroy_object(tile_contains_pid_obj(KITSUNE_HIB_HEX,dude_elevation,33556339));
       chamber:=create_object(33556343,KITSUNE_HIB_HEX,dude_elevation);
    end else begin
@@ -936,38 +933,38 @@ procedure Node999 begin
 end
 
 procedure timed_event_p_proc begin
- if (self_visible) then begin
-   if (combat_is_initialized == false) then begin
-      if (Kitsune_In_Party == false) then begin
-      //blah
-      end else begin
-         if (party_healed_bad) then begin
-            call Node5000;
-         end else if (self_is_poisoned) then begin
-            call Node5001;
-         end else if (self_rads > 0) then begin
-            call Node5002;
-         end else if (Is_Crippled(self_obj)) then begin
-            call Node5003;
-         end else if (Is_Blind(self_obj)) then begin
-            call Node5004;
-         end else if ( (Sulik_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3001;
-         end else if ( (Vic_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3002;
-         end else if ( (Miria_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3003;
-         end else if ( (Myron_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3004;
-         end else if ( (Marcus_In_Party) and (random(1,2) == 2) ) then begin
-            call Node3005;
+   if (self_visible) then begin
+      if (combat_is_initialized == false) then begin
+         if (Kitsune_In_Party == false) then begin
+         //blah
          end else begin
-            call Node3000;
+            if (party_healed_bad) then begin
+               call Node5000;
+            end else if (self_is_poisoned) then begin
+               call Node5001;
+            end else if (self_rads > 0) then begin
+               call Node5002;
+            end else if (Is_Crippled(self_obj)) then begin
+               call Node5003;
+            end else if (Is_Blind(self_obj)) then begin
+               call Node5004;
+            end else if ( (Sulik_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3001;
+            end else if ( (Vic_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3002;
+            end else if ( (Miria_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3003;
+            end else if ( (Myron_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3004;
+            end else if ( (Marcus_In_Party) and (random(1,2) == 2) ) then begin
+               call Node3005;
+            end else begin
+               call Node3000;
+            end
          end
       end
    end
- end
- flush_add_timer_event_sec(self_obj, random(90, 120), 1);
+   flush_add_timer_event_sec(self_obj, random(60, 90), 1);
 end
 
 procedure Node2000 begin
diff --git a/scripts_src/gecko/gclenny.ssl b/scripts_src/gecko/gclenny.ssl
index 538535b8aa..1fab586c3b 100644
--- a/scripts_src/gecko/gclenny.ssl
+++ b/scripts_src/gecko/gclenny.ssl
@@ -28,7 +28,6 @@
 #define SCRIPT_REALNAME "gclenny"
 #include "../headers/define.h"
 #include "../headers/gecko.h"
-#include "../headers/newr1.h" //added by killap
 #include "../headers/rpu.h"
 
 #define NAME                    SCRIPT_GCLENNY
@@ -244,7 +243,7 @@ procedure map_enter_p_proc begin
    end
 
    //added by killap
-   add_timer_event(self_obj, random(25, 40), 900);
+   flush_add_timer_event_sec(self_obj, random(25, 40), 900);
 end
 
 procedure map_update_p_proc begin
@@ -275,7 +274,6 @@ procedure map_update_p_proc begin
          end
       end
    end
-
 end
 
 //added by killap - expansion
@@ -333,6 +331,10 @@ procedure critter_p_proc begin
          call Node071;
          ndebug("Childkiller");
       end
+      //else if (has_rep_berserker) then begin
+      //   call Node072;
+      //   ndebug("Berserker");
+      //end
       else if (has_rep_slaver) then begin
          call Node073;
          ndebug("Slaver");
@@ -611,6 +613,7 @@ procedure timed_event_p_proc begin
                floater(5002);
          end
       end
+      flush_add_timer_event_sec(self_obj, random(60, 90), 900);
    end
 end
 //end added
diff --git a/scripts_src/klamath/kcsulik.ssl b/scripts_src/klamath/kcsulik.ssl
index edd5a7ed5f..195517e6e9 100644
--- a/scripts_src/klamath/kcsulik.ssl
+++ b/scripts_src/klamath/kcsulik.ssl
@@ -28,7 +28,6 @@
 #include "../headers/define.h"
 #include "../headers/klamath.h"
 #include "../headers/kladwtn.h"
-#include "../headers/newr1.h" //added by killap
 
 #define NAME                    SCRIPT_KCSULIK
 #define TOWN_REP_VAR            GVAR_TOWN_REP_KLAMATH
@@ -264,14 +263,12 @@ end
    set up the Team number and AI packet for this critter. This will override the
    default from the prototype, and needs to be set in scripts. */
 procedure map_enter_p_proc begin
-
-    if ( (cur_town == AREA_PRIMITIVE_TRIBE) and not (Sulik_In_Party) and not (party_is_waiting) and (local_var(LVAR_At_Tribe) > 0) ) then begin
-         add_timer_event(self_obj,game_ticks(random(15,25)),1);
-    end else begin
-
+   if ( (cur_town == AREA_PRIMITIVE_TRIBE) and not (Sulik_In_Party) and not (party_is_waiting) and (local_var(LVAR_At_Tribe) > 0) ) then begin
+        add_timer_event(self_obj,game_ticks(random(15,25)),1);
+   end else begin
       party_member_map_enter;
       if (Sulik_In_Party) then begin
-      //do nothing
+         //do nothing
       end
       else begin
          Only_Once:=0;
@@ -279,10 +276,10 @@ procedure map_enter_p_proc begin
          //NEVER SET AI FOR NPCs
          //critter_add_trait(self_obj,TRAIT_OBJECT,OBJECT_AI_PACKET,AI_PARTY_SULIK_DEFENSIVE);
       end
-    end
+   end
 
-    //added by killap
-    add_timer_event(self_obj, random(25, 40), 900);
+   //added by killap
+   flush_add_timer_event_sec(self_obj, random(25, 40), 900);
 end
 
 procedure map_update_p_proc begin
@@ -313,7 +310,6 @@ procedure map_update_p_proc begin
          end
       end
    end
-
 end
 
 //added by killap - RP
@@ -1453,7 +1449,6 @@ procedure Node054 begin
    NLowOption(926,Node003);
    NLowOption(927,Node999);
    //end added
-
 end
 
 procedure Node055 begin
@@ -2073,7 +2068,7 @@ procedure timed_event_p_proc begin
                floater(3502);
          end
       end
-      add_timer_event(self_obj, random(50, 80), 900);
+      flush_add_timer_event_sec(self_obj, random(60, 90), 900);
    //end added
    end else if (fixed_param == 1) then begin
       if Sulik_In_Party then begin
diff --git a/scripts_src/main/nhmyron.ssl b/scripts_src/main/nhmyron.ssl
index 46bbb10b56..c636e59d56 100644
--- a/scripts_src/main/nhmyron.ssl
+++ b/scripts_src/main/nhmyron.ssl
@@ -22,7 +22,6 @@
 #include "../headers/command.h"
 #include "../headers/newreno.h"
 #include "../headers/partybkg.h"
-#include "../headers/newr1.h" //added by killap
 
 /* Standard Script Procedures */
 procedure start;
@@ -458,7 +457,7 @@ procedure timed_event_p_proc begin
          end
       end
    end
-   nr_add_timer_event_rand(self_obj, 80, 120, float_param); //edit by killap - was (25,45)
+   nr_add_timer_event_rand(self_obj, 60, 90, float_param); //edit by killap - was (25,45)
 end
 
 procedure map_update_p_proc begin
diff --git a/scripts_src/main/obj_dude.ssl b/scripts_src/main/obj_dude.ssl
index b73d591c1f..6428ac0eef 100644
--- a/scripts_src/main/obj_dude.ssl
+++ b/scripts_src/main/obj_dude.ssl
@@ -17,7 +17,6 @@
 #include "../headers/command.h"
 #include "../headers/newreno.h"
 #include "../headers/v13.h"
-#include "../headers/newr1.h" //added by killap
 #include "../sfall/sfall.h"
 
 #define LVAR_Last_Digest_Time    (0)
diff --git a/scripts_src/modoc/mcdavin.ssl b/scripts_src/modoc/mcdavin.ssl
index 0f81958960..bebe7a7a68 100644
--- a/scripts_src/modoc/mcdavin.ssl
+++ b/scripts_src/modoc/mcdavin.ssl
@@ -24,7 +24,6 @@
 
 #define SCRIPT_REALNAME "mcdavin"
 #include "../headers/define.h"
-#include "../headers/newr1.h" //added by killap
 
 #define NAME                        SCRIPT_MCDAVIN
 #define TOWN_REP_VAR                GVAR_TOWN_REP_MODOC
@@ -128,7 +127,7 @@ procedure timed_event_p_proc begin
                floater(2002);
          end
       end
-      add_timer_event(self_obj, random(25, 40), 900);
+      flush_add_timer_event_sec(self_obj, random(60, 90), 900);
    //end added by killap
    end else if (fixed_param == param_clear_float) then begin
       float_msg(self_obj, " ", FLOAT_COLOR_NORMAL);
@@ -163,7 +162,7 @@ procedure map_enter_p_proc begin
    end
 
    //added by killap
-   add_timer_event(self_obj, random(25, 40), 900);
+   flush_add_timer_event_sec(self_obj, random(25, 40), 900);
 end
 
 procedure map_update_p_proc begin
diff --git a/scripts_src/modoc/mcmiria.ssl b/scripts_src/modoc/mcmiria.ssl
index c80c8854a3..9dfac0f224 100644
--- a/scripts_src/modoc/mcmiria.ssl
+++ b/scripts_src/modoc/mcmiria.ssl
@@ -24,7 +24,6 @@
 
 #define SCRIPT_REALNAME "mcmiria"
 #include "../headers/define.h"
-#include "../headers/newr1.h" //added by killap
 
 #define NAME                        SCRIPT_MCMIRIA
 #define TOWN_REP_VAR                GVAR_TOWN_REP_MODOC
@@ -161,7 +160,7 @@ procedure timed_event_p_proc begin
                floater(2002);
          end
       end
-      add_timer_event(self_obj, random(25, 40), 900);
+      flush_add_timer_event_sec(self_obj, random(60, 90), 900);
    //end added by killap
    end else if (fixed_param == param_clear_float) then begin
       float_msg(self_obj, " ", FLOAT_COLOR_NORMAL);
@@ -217,7 +216,7 @@ procedure map_enter_p_proc begin
    end
 
    //added by killap
-   add_timer_event(self_obj, random(25, 40), 900);
+   flush_add_timer_event_sec(self_obj, random(25, 40), 900);
 end
 
 procedure critter_p_proc begin
diff --git a/scripts_src/newreno/nckitty.ssl b/scripts_src/newreno/nckitty.ssl
index ef47849419..269675f57d 100644
--- a/scripts_src/newreno/nckitty.ssl
+++ b/scripts_src/newreno/nckitty.ssl
@@ -23,7 +23,6 @@
 #include "../headers/command.h"
 #include "../headers/newreno.h"
 #include "../headers/modreact.h"
-#include "../headers/newr1.h" //added by killap
 
 /* Standard Script Procedures */
 procedure start;
diff --git a/scripts_src/valtcity/vccasidy.ssl b/scripts_src/valtcity/vccasidy.ssl
index d6ccef7a79..7a0779dd02 100644
--- a/scripts_src/valtcity/vccasidy.ssl
+++ b/scripts_src/valtcity/vccasidy.ssl
@@ -28,7 +28,6 @@
 #define SCRIPT_REALNAME "vccasidy"
 #include "../headers/define.h"
 //#include "../headers/<TownName.h>"
-#include "../headers/newr1.h" //added by killap
 
 #define NAME                    SCRIPT_VCCASIDY
 #define TOWN_REP_VAR            (GVAR_TOWN_REP_VAULT_CITY)
@@ -217,8 +216,7 @@ procedure map_enter_p_proc begin
    set_self_team(TEAM_SLAVES);
    //critter_add_trait(self_obj,TRAIT_OBJECT,OBJECT_AI_PACKET,AI_TOUGH_CITIZEN);
 
-   //rm_timer_event( self_obj ); - comment out by killap
-   add_timer_event( self_obj, game_ticks( random(40, 50) ), 1);
+   flush_add_timer_event_sec(self_obj, random(40, 50), 1);
 end
 
 procedure map_update_p_proc begin
@@ -279,7 +277,7 @@ procedure timed_event_p_proc begin
                call Node2019;
          end
       end
-      add_timer_event( self_obj, game_ticks( random(100, 125) ), 1); //edit by killap - was (40,50)
+      flush_add_timer_event_sec(self_obj, random(60, 90), 1); //edit by killap - was (40,50)
    end
    else if( fixed_param == 2 ) then begin
       kill_critter( self_obj, ANIM_fall_front );
diff --git a/scripts_src/vault13/ocgoris.ssl b/scripts_src/vault13/ocgoris.ssl
index 247cebf168..2a97350a4f 100644
--- a/scripts_src/vault13/ocgoris.ssl
+++ b/scripts_src/vault13/ocgoris.ssl
@@ -216,7 +216,7 @@ procedure timed_event_p_proc begin
                floater(2002);
          end
       end
-      add_timer_event(self_obj, random(50, 80), 900);
+      flush_add_timer_event_sec(self_obj, random(60, 90), 900);
    //end added by killap
    end else if (fixed_param == TIMER_DESTROY) then begin
       if (not obj_on_screen(self_obj)) then
@@ -256,7 +256,7 @@ procedure map_enter_p_proc begin
 //   critter_add_trait(self_obj,TRAIT_OBJECT,OBJECT_AI_PACKET,AI_VAULT_DEATHCLAW);
 
    //added by killap
-   add_timer_event(self_obj, random(25, 40), 900);
+   flush_add_timer_event_sec(self_obj, random(25, 40), 900);
 end