Makes false alarm use more explicit in event code.

This commit is contained in:
AnturK
2017-11-11 14:36:36 -06:00
committed by CitadelStationBot
parent 662c42b450
commit f6e07cf824
47 changed files with 952 additions and 47 deletions
+20
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
// Basically, cut the event frequency in half to simulate unluckiness.
/datum/round_event_control/fridaythethirteen
@@ -15,4 +16,23 @@
/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
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(fake)
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>")
+1 -1
View File
@@ -19,7 +19,7 @@
new /mob/living/simple_animal/parrot/Poly/ghost(Poly.loc)
qdel(Poly)
/datum/round_event/spooky/announce()
/datum/round_event/spooky/announce(fake)
priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE")
//spooky foods (you can't actually make these when it's not halloween)
+1 -1
View File
@@ -61,7 +61,7 @@
to_chat(lover, "<span class='warning'><B>You're on a date with [date]! Protect them at all costs. This takes priority over all other loyalties.</B></span>")
/datum/round_event/valentines/announce()
/datum/round_event/valentines/announce(fake)
priority_announce("It's Valentine's Day! Give a valentine to that special someone!")
/obj/item/valentine
+2 -2
View File
@@ -35,7 +35,7 @@
for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines)
Monitor.icon_state = "entertainment_xmas"
/datum/round_event/presents/announce()
/datum/round_event/presents/announce(fake)
priority_announce("Ho Ho Ho, Merry Xmas!", "Unknown Transmission")
@@ -105,7 +105,7 @@
/datum/round_event/santa
var/mob/living/carbon/human/santa //who is our santa?
/datum/round_event/santa/announce()
/datum/round_event/santa/announce(fake)
priority_announce("Santa is coming to town!", "Unknown Transmission")
/datum/round_event/santa/start()