From 231425e0a24f254b45bb5ade873deb4fe6943c34 Mon Sep 17 00:00:00 2001
From: Dahlular <Dahlular@gmail.com>
Date: Fri, 30 Apr 2021 15:01:13 -0600
Subject: [PATCH] pirates, greytide, and wocky slush

---
 code/modules/events/pirates.dm      | 2 +-
 code/modules/events/prison_break.dm | 3 ++-
 code/modules/power/generator.dm     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 84521b40..9639a2de 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -14,7 +14,7 @@
 	return ..()
 
 /datum/round_event/pirates
-	startWhen = 60 //2 minutes to answer
+	startWhen = 300 //5 minutes to answer
 	var/datum/comm_message/threat
 	var/payoff = 0
 	var/paid_off = FALSE
diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm
index e6793cad..00ccfadc 100644
--- a/code/modules/events/prison_break.dm
+++ b/code/modules/events/prison_break.dm
@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/grey_tide
 	max_occurrences = 2
 	min_players = 5
+	map_blacklist = list("LayeniaStation.dmm")
 
 /datum/round_event/grey_tide
 	announceWhen = 50
@@ -67,4 +68,4 @@
 				temp.prison_open()
 			else if(istype(O, /obj/machinery/door_timer))
 				var/obj/machinery/door_timer/temp = O
-				temp.timer_end(forced = TRUE)
\ No newline at end of file
+				temp.timer_end(forced = TRUE)
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index c2a67735..56ed965e 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -18,8 +18,8 @@
 	var/grumping = 0 // is the engine currently doing grumpy things
 	var/list/grump_prefix = list("an upsetting", "an unsettling",
 	"a scary", "a loud", "a sassy", "a grouchy", "a grumpy",
-	"an awful", "a horrible", "a despicable", "a pretty rad", "a godawful")
-	var/list/grump_suffix = list("noise", "racket", "ruckus", "sound", "clatter", "fracas", "hubbub")
+	"an awful", "a horrible", "a despicable", "a pretty rad", "a godawful, a wocky")
+	var/list/grump_suffix = list("noise", "racket", "ruckus", "sound", "clatter", "fracas", "hubbub, slush")
 	var/sound_engine1 = 'sound/machines/tractor_running.ogg'
 	var/sound_engine2 = 'sound/machines/engine_highpower.ogg'
 	var/sound_tractorrev = 'sound/machines/tractorrev.ogg'