diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index f2b0357ddd..3be305abaf 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -1,5 +1,5 @@
 /datum/event/alien_infestation
-	announceWhen	= 75
+	announceWhen	= 400
 	oneShot			= 1
 
 	var/spawncount = 1
@@ -7,7 +7,7 @@
 
 
 /datum/event/alien_infestation/setup()
-	announceWhen = rand(140, 180)
+	announceWhen = rand(announceWhen, announceWhen + 50)
 	spawncount = rand(1, 2)
 
 /datum/event/alien_infestation/announce()
diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm
index 6d3a4afb00..c578c94cf3 100644
--- a/code/modules/events/spider_infestation.dm
+++ b/code/modules/events/spider_infestation.dm
@@ -1,12 +1,12 @@
 /datum/event/spider_infestation
-	announceWhen	= 75
+	announceWhen	= 400
 	oneShot			= 1
 
 	var/spawncount = 1
 
 
 /datum/event/spider_infestation/setup()
-	announceWhen = rand(140, 180)
+	announceWhen = rand(announceWhen, announceWhen + 50)
 	spawncount = rand(5, 8)
 
 /datum/event/spider_infestation/announce()
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index bc9747a2d6..9f5c97117b 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -25,11 +25,14 @@
 	health = 200
 	melee_damage_lower = 15
 	melee_damage_upper = 20
+	heat_damage_per_tick = 20
+	cold_damage_per_tick = 20
 	var/poison_per_bite = 5
 	var/poison_type = "toxin"
 	faction = "spiders"
 	var/busy = 0
 	pass_flags = PASSTABLE
+	move_to_delay = 6
 
 //nursemaids - these create webs and eggs
 /mob/living/simple_animal/hostile/giant_spider/nurse
@@ -57,6 +60,7 @@
 	melee_damage_lower = 10
 	melee_damage_upper = 20
 	poison_per_bite = 5
+	move_to_delay = 4
 
 /mob/living/simple_animal/hostile/giant_spider/AttackingTarget()
 	..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 57c53cb6af..d1a60c5ed8 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -133,13 +133,13 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 
 	health = 100
 	maxHealth = 100
-	var/obj/item/staff = null // the staff that changed they, never attack the bearer of this staff
+	var/mob/living/creator = null // the creator
 	var/destroy_objects = 0
 	var/knockdown_people = 0
 
-/mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/obj/item/staff)
+/mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator)
 	..(loc)
-	CopyObject(copy, staff)
+	CopyObject(copy, creator)
 
 /mob/living/simple_animal/hostile/mimic/copy/Die()
 
@@ -148,10 +148,10 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 	..()
 
 /mob/living/simple_animal/hostile/mimic/copy/ListTargets()
-	// Return a list of targets that isn't the holder of our staff
-	return view(src, 7) - get(staff, /mob)
+	// Return a list of targets that isn't the creator
+	return view(src, 7) - creator
 
-/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(var/obj/O, var/obj/item/staff)
+/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(var/obj/O, var/mob/living/creator)
 
 	if((istype(O, /obj/item) || istype(O, /obj/structure)) && !is_type_in_list(O, protected_objects))
 
@@ -177,9 +177,9 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 			move_to_delay = 2 * I.w_class
 
 		maxHealth = health
-		if(staff)
-			src.staff = staff
-			faction = "\ref[staff]" // very unique
+		if(creator)
+			src.creator = creator
+			faction = "\ref[creator]" // very unique
 		return 1
 	return
 
diff --git a/code/modules/projectiles/projectile/animate.dm b/code/modules/projectiles/projectile/animate.dm
index af229e6502..5950ac5955 100644
--- a/code/modules/projectiles/projectile/animate.dm
+++ b/code/modules/projectiles/projectile/animate.dm
@@ -10,4 +10,4 @@
 	. = ..()
 	if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
 		var/obj/O = change
-		new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, shot_from)
+		new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
diff --git a/html/changelog.html b/html/changelog.html
index 94d4b3c706..3100b3e52c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -61,13 +61,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h2 class="date">12 January 2013</h2>
 	<h3 class="author">Cael Aislinn updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="imageadd">Spiders which will breed and spread through vents. Different classes of vents. AI controlled only at the moment.</li>
-		<li class="imageadd">Farm animals! Cows, goats and chickens are now available. You can order them at Cargo Bay.</li>
+		<li class="rscadd">Spiders which will breed and spread through vents. Different classes of vents. AI controlled only at the moment.</li>
+		<li class="rscadd">Farm animals! Cows, goats and chickens are now available. You can order them at Cargo Bay.</li>
 	</ul>
 	<h3 class="author">Giacom updated:</h3>
 	<ul class="changes bgimages16">
+		<li class="tweak">Staff of animation mimics will no longer care whether you are holding the staff or not, they will never attack their creator.</li>
 		<li class="tweak">Brainrot will only need alkysine to be cured.</li>
-		<li class="imageadd">New spider infestation event based on Cael's spiders. The announcement will be the same as alien infestations.</li>
+		<li class="rscadd">New spider infestation event based on Cael's spiders. The announcement will be the same as alien infestations.</li>
 	</ul>
 </div>