From a49e6035a9ca96442e058f2764c15504da6b5c73 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Thu, 30 Apr 2015 10:02:24 +0200
Subject: [PATCH] Fixes #9029.

Reduces the announcement message delay for spiders from 800-900 seconds to 180-300 seconds.
Number of spiders now based on severity, with a moderate level event spawning as many spiders as before.
---
 code/modules/events/spider_infestation.dm        | 9 ++++-----
 html/changelogs/PsiOmegaDelta-ChitterChitter.yml | 4 ++++
 html/changelogs/PsiOmegaDelta.yml                | 3 ---
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 html/changelogs/PsiOmegaDelta-ChitterChitter.yml
 delete mode 100644 html/changelogs/PsiOmegaDelta.yml

diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm
index d96e4fb54c3..52c3fdf0489 100644
--- a/code/modules/events/spider_infestation.dm
+++ b/code/modules/events/spider_infestation.dm
@@ -1,14 +1,13 @@
 /var/global/sent_spiders_to_station = 0
 
 /datum/event/spider_infestation
-	announceWhen	= 400
-
+	announceWhen	= 90
 	var/spawncount = 1
 
 
 /datum/event/spider_infestation/setup()
-	announceWhen = rand(announceWhen, announceWhen + 50)
-	spawncount = rand(8, 12)	//spiderlings only have a 50% chance to grow big and strong
+	announceWhen = rand(announceWhen, announceWhen + 60)
+	spawncount = rand(4 * severity, 6 * severity)	//spiderlings only have a 50% chance to grow big and strong
 	sent_spiders_to_station = 0
 
 /datum/event/spider_infestation/announce()
@@ -26,4 +25,4 @@
 		var/obj/vent = pick(vents)
 		new /obj/effect/spider/spiderling(vent.loc)
 		vents -= vent
-		spawncount--
\ No newline at end of file
+		spawncount--
diff --git a/html/changelogs/PsiOmegaDelta-ChitterChitter.yml b/html/changelogs/PsiOmegaDelta-ChitterChitter.yml
new file mode 100644
index 00000000000..8f07219c910
--- /dev/null
+++ b/html/changelogs/PsiOmegaDelta-ChitterChitter.yml
@@ -0,0 +1,4 @@
+author: PsiOmegaDelta
+changes:
+  - tweak: "The spider infestation event now makes an announcement much sooner."
+delete-after: false
diff --git a/html/changelogs/PsiOmegaDelta.yml b/html/changelogs/PsiOmegaDelta.yml
deleted file mode 100644
index 6fdea55f549..00000000000
--- a/html/changelogs/PsiOmegaDelta.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-author: PsiOmegaDelta
-changes: []
-delete-after: false