From 36f4a3b53eb2bbb1c9c760ff24d91bb9792d12d3 Mon Sep 17 00:00:00 2001 From: Dahlular Date: Sun, 31 Oct 2021 23:29:05 -0600 Subject: [PATCH 1/2] halloween fixerooni --- code/modules/holiday/holidays.dm | 2 +- tgstation.dme | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 31dc4707c..d88b23a4d 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -324,7 +324,7 @@ name = HALLOWEEN begin_day = 28 begin_month = OCTOBER - end_day = 2 + end_day = 1 end_month = NOVEMBER /datum/holiday/halloween/greet() diff --git a/tgstation.dme b/tgstation.dme index aa1885cda..8ddf5cb53 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1856,6 +1856,7 @@ #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm" #include "code\modules\holiday\holidays.dm" +#include "code\modules\holiday\halloween\bartholomew.dm" #include "code\modules\holodeck\area_copy.dm" #include "code\modules\holodeck\computer.dm" #include "code\modules\holodeck\holo_effect.dm" From e3c956d3e4c789d65a8ae9f1db79d885a32beb1b Mon Sep 17 00:00:00 2001 From: Dahlular Date: Sun, 31 Oct 2021 23:29:31 -0600 Subject: [PATCH 2/2] you too, cat --- code/modules/holiday/holidays.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index d88b23a4d..3f71a449b 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -337,7 +337,7 @@ name = "Bartholomew" begin_day = 27 begin_month = OCTOBER - end_day = 2 + end_day = 1 end_month = NOVEMBER /datum/holiday/vegan