diff --git a/scripts_src/brokhill/hcmarcus.ssl b/scripts_src/brokhill/hcmarcus.ssl
index 05669b67c..9b97bbabb 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 86bebabf4..a4f4ab5d9 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 c7d88ecf2..616adc819 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 e165ea73b..ffd221808 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 a1b85520b..3c977fe51 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 538535b8a..1fab586c3 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 edd5a7ed5..195517e6e 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 46bbb10b5..c636e59d5 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 b73d591c1..6428ac0ee 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 0f8195896..bebe7a7a6 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 c80c8854a..9dfac0f22 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 ef4784941..269675f57 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 d6ccef7a7..7a0779dd0 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 247cebf16..2a97350a4 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