From 96b9a3cbadfd8701d65236ac1e0fbdefbf88c89b Mon Sep 17 00:00:00 2001
From: boodaliboo <40642354+boodaliboo@users.noreply.github.com>
Date: Wed, 30 Oct 2019 18:20:13 -0700
Subject: [PATCH 1/3] makes halloween commit

---
 code/modules/holiday/halloween.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index 5b53499a8b3a..baf9735d8e1b 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -46,7 +46,7 @@
 /obj/structure/closet/proc/set_spooky_trap()
 	if(prob(0.1))
 		trapped = INSANE_CLOWN
-		return
+		returncode/modules/holiday/halloween.dm
 	if(prob(1))
 		trapped = ANGRY_FAITHLESS
 		return

From fa298685639ee1b9f41fdf38ca5b48bc38e29692 Mon Sep 17 00:00:00 2001
From: boodaliboo <40642354+boodaliboo@users.noreply.github.com>
Date: Fri, 8 Nov 2019 09:11:55 -0800
Subject: [PATCH 2/3] Update nuclear_challenge.dm

---
 .../modules/antagonists/nukeop/equipment/nuclear_challenge.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index e364150f2f1d..f30ae46a4e54 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -1,6 +1,6 @@
 #define CHALLENGE_TELECRYSTALS 280
 #define CHALLENGE_TIME_LIMIT 3000
-#define CHALLENGE_MIN_PLAYERS 50
+#define CHALLENGE_MIN_PLAYERS 40
 #define CHALLENGE_SHUTTLE_DELAY 15000 // 25 minutes, so the ops have at least 5 minutes before the shuttle is callable.
 
 GLOBAL_LIST_EMPTY(jam_on_wardec)
@@ -125,4 +125,4 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
 #undef CHALLENGE_TELECRYSTALS
 #undef CHALLENGE_TIME_LIMIT
 #undef CHALLENGE_MIN_PLAYERS
-#undef CHALLENGE_SHUTTLE_DELAY
\ No newline at end of file
+#undef CHALLENGE_SHUTTLE_DELAY

From 48e9f42d8e0a9a28e484d65b8630fb9c83a21708 Mon Sep 17 00:00:00 2001
From: boodaliboo <40642354+boodaliboo@users.noreply.github.com>
Date: Fri, 8 Nov 2019 09:14:19 -0800
Subject: [PATCH 3/3] Update halloween.dm

---
 code/modules/holiday/halloween.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index baf9735d8e1b..5b53499a8b3a 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -46,7 +46,7 @@
 /obj/structure/closet/proc/set_spooky_trap()
 	if(prob(0.1))
 		trapped = INSANE_CLOWN
-		returncode/modules/holiday/halloween.dm
+		return
 	if(prob(1))
 		trapped = ANGRY_FAITHLESS
 		return