From a1e4591c5ad2455f038ecfd925cc387de209e95c Mon Sep 17 00:00:00 2001 From: alex-gh Date: Wed, 23 Apr 2014 18:26:45 +0200 Subject: [PATCH 1/2] Moved more destructive events later in the round --- code/modules/events/event_dynamic.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index b8ba1e2de79..c5f3ee4d8c4 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -63,10 +63,9 @@ var/global/list/possibleEvents = list() // possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200) possibleEvents[/datum/event/carp_migration] = 50 + 25 * active_with_role["Engineer"] - possibleEvents[/datum/event/spider_infestation] = 50 + 25 * active_with_role["Security"] possibleEvents[/datum/event/dust] = 50 + 50 * active_with_role["Engineer"] possibleEvents[/datum/event/dust/meaty] = 50 + 50 * active_with_role["Engineer"] - possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Engineer"] + possibleEvents[/datum/event/rogue_drone] = 25 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"] possibleEvents[/datum/event/infestation] = 50 + 25 * active_with_role["Janitor"] @@ -82,12 +81,16 @@ var/global/list/possibleEvents = list() if(minutes_passed >= 30) // Give engineers time to set up engine possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role["Engineer"] possibleEvents[/datum/event/meteor_shower] = 40 * active_with_role["Engineer"] - possibleEvents[/datum/event/blob] = 20 * active_with_role["Engineer"] possibleEvents[/datum/event/anomaly/anomaly_pyro] = 100 + 60 * active_with_role["Engineer"] possibleEvents[/datum/event/anomaly/anomaly_vortex] = 50 + 25 * active_with_role["Engineer"] possibleEvents[/datum/event/anomaly/anomaly_bluespace] = 50 + 25 * active_with_role["Engineer"] possibleEvents[/datum/event/anomaly/anomaly_flux] = 50 + 50 * active_with_role["Engineer"] + if(minutes_passed >= 60) //Delay for potentially destructive events. + possibleEvents[/datum/event/blob] = 20 * active_with_role["Engineer"] + possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Engineer"] + possibleEvents[/datum/event/spider_infestation] = 50 + 25 * active_with_role["Security"] + possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 50 if(active_with_role["Medical"] > 0) possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 50 From 780ab3a32b6dd0498d6a1bea08b65b96f6252d50 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Wed, 23 Apr 2014 18:30:19 +0200 Subject: [PATCH 2/2] Added a random delay to mass hallucination announcement, made hallucinations more severe --- code/modules/events/tgevents/mass_hallucination.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/events/tgevents/mass_hallucination.dm b/code/modules/events/tgevents/mass_hallucination.dm index 90fba19bdca..9241cc6217d 100644 --- a/code/modules/events/tgevents/mass_hallucination.dm +++ b/code/modules/events/tgevents/mass_hallucination.dm @@ -1,5 +1,8 @@ +/datum/event/mass_hallucination/setup() + announceWhen = rand(0, 20) + /datum/event/mass_hallucination/start() for(var/mob/living/carbon/C in living_mob_list) - C.hallucination += rand(20, 50) + C.hallucination += rand(50, 100) /datum/event/mass_hallucination/announce() command_alert("It seems that station [station_name()] is passing through a minor radiation field, this may cause some hallucination, but no further damage") \ No newline at end of file