diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 93fc84f97c7..07208e5b656 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -60,21 +60,21 @@ var/list/event_last_fired = list() possibleEvents[/datum/event/infestation] = 50 + 25 * active_with_role["Janitor"] possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25 - possibleEvents[/datum/event/ionstorm] = 25 + active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 - possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role["Engineer"] - possibleEvents[/datum/event/electrical_storm] = 75 + 25 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] - possibleEvents[/datum/event/wallrot] = 50 * active_with_role["Engineer"] + 100 * active_with_role["Botanist"] + possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5 + possibleEvents[/datum/event/grid_check] = 25 + 20 * active_with_role["Engineer"] + possibleEvents[/datum/event/electrical_storm] = 10 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"] + possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Botanist"] if(!spacevines_spawned) - possibleEvents[/datum/event/spacevine] = 5 + 10 * active_with_role["Engineer"] + possibleEvents[/datum/event/spacevine] = 5 + 5 * active_with_role["Engineer"] if(minutes_passed >= 30) // Give engineers time to set up engine - possibleEvents[/datum/event/meteor_wave] = 20 * active_with_role["Engineer"] - possibleEvents[/datum/event/meteor_shower] = 80 * active_with_role["Engineer"] - possibleEvents[/datum/event/blob] = 30 * active_with_role["Engineer"] + 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/viral_infection] = 25 + active_with_role["Medical"] * 100 if(active_with_role["Medical"] > 0) - possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 100 + possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 50 possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 150 possibleEvents[/datum/event/viral_outbreak] = active_with_role["Medical"] * 10 possibleEvents[/datum/event/organ_failure] = active_with_role["Medical"] * 50 diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 585cf6122a2..89347a299d9 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -2,8 +2,8 @@ var/list/allEvents = typesof(/datum/event) - /datum/event var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event //var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation -var/eventTimeLower = 6000 //10 minutes -var/eventTimeUpper = 12000 //15 minutes +var/eventTimeLower = 9000 //15 minutes +var/eventTimeUpper = 15000 //25 minutes var/scheduledEvent = null diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 9d8b5cc3029..99e2d69e0ea 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -24,9 +24,9 @@ if(istype(T.loc, /area/maintenance) || istype(T.loc, /area/crew_quarters)) continue if(istype(H,/mob/living/carbon/human)) - H.apply_effect((rand(5,25)),IRRADIATE,0) + H.apply_effect((rand(2,15)),IRRADIATE,0) if(prob(5)) - H.apply_effect((rand(30,50)),IRRADIATE,0) + H.apply_effect((rand(10,30)),IRRADIATE,0) if (prob(75)) randmutb(H) domutcheck(H,null,1)