From e8e18ebc5f16413ea1fa2c22b1402ca51f5e70eb Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 08:11:50 -0600 Subject: [PATCH] Update friday13th.dm --- code/modules/events/holiday/friday13th.dm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/code/modules/events/holiday/friday13th.dm b/code/modules/events/holiday/friday13th.dm index 0dbf8d7ec9..b1db15a896 100644 --- a/code/modules/events/holiday/friday13th.dm +++ b/code/modules/events/holiday/friday13th.dm @@ -1,22 +1,3 @@ -<<<<<<< HEAD -// Basically, cut the event frequency in half to simulate unluckiness. - -/datum/round_event_control/fridaythethirteen - name = "Friday the 13th" - holidayID = FRIDAY_13TH - typepath = /datum/round_event/fridaythethirteen - weight = -1 - max_occurrences = 1 - earliest_start = 0 - -/datum/round_event/fridaythethirteen/start() - //Very unlucky, cut the frequency of events in half. - events.frequency_lower /= 2 - events.frequency_upper /= 2 - -/datum/round_event/fridaythethirteen/announce() - for(var/mob/living/L in player_list) -======= // Basically, cut the event frequency in half to simulate unluckiness. /datum/round_event_control/fridaythethirteen @@ -34,5 +15,4 @@ /datum/round_event/fridaythethirteen/announce(fake) for(var/mob/living/L in player_list) ->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559) - to_chat(L, "You are feeling unlucky today.") \ No newline at end of file + to_chat(L, "You are feeling unlucky today.")