shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update friday13th.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-12 08:11:50 -06:00
committed by GitHub
parent 3ae0051dc7
commit e8e18ebc5f
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/holiday/friday13th.dm
+1 -21
View File
@@ -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. // Basically, cut the event frequency in half to simulate unluckiness.
/datum/round_event_control/fridaythethirteen /datum/round_event_control/fridaythethirteen
@@ -34,5 +15,4 @@
/datum/round_event/fridaythethirteen/announce(fake) /datum/round_event/fridaythethirteen/announce(fake)
for(var/mob/living/L in player_list) for(var/mob/living/L in player_list)
>>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559) to_chat(L, "<span class='warning'>You are feeling unlucky today.</span>")
to_chat(L, "<span class='warning'>You are feeling unlucky today.</span>")