From 5b5209e0a5b0965b4db922afef1339797405ee6b Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 11 Jun 2015 11:30:49 -0400 Subject: [PATCH 1/2] Re-adds Pyroclastic Anomally Event --- code/modules/events/event_container.dm | 2 +- code/modules/events/event_dynamic.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 31186f4527d..4347ae160a3 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -164,7 +164,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT new /datum/event_meta(EVENT_LEVEL_MODERATE, "Dimensional Tear", /datum/event/tear, 0, list(ASSIGNMENT_SECURITY = 25)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Vent Clog", /datum/event/vent_clog, 250), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Wormholes", /datum/event/wormholes, 150), -// new /datum/event_meta(EVENT_LEVEL_MODERATE, "Pyro Anomaly", /datum/event/anomaly/anomaly_pyro, 100, list(ASSIGNMENT_ENGINEER = 60)), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Pyro Anomaly", /datum/event/anomaly/anomaly_pyro, 100, list(ASSIGNMENT_ENGINEER = 60)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Vortex Anomaly", /datum/event/anomaly/anomaly_vortex, 50, list(ASSIGNMENT_ENGINEER = 25)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Bluespace Anomaly", /datum/event/anomaly/anomaly_bluespace, 50, list(ASSIGNMENT_ENGINEER = 25)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Flux Anomaly", /datum/event/anomaly/anomaly_flux, 50, list(ASSIGNMENT_ENGINEER = 50)), diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 517db3f6d66..3838980832d 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -80,7 +80,7 @@ var/global/list/possibleEvents = list() possibleEvents[/datum/event/spacevine] = 10 + 5 * active_with_role["Engineer"] if(minutes_passed >= 30) // Give engineers time to set up engine possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Engineer"] -// possibleEvents[/datum/event/anomaly/anomaly_pyro] = 100 + 60 * 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"] From b398977d1661c65ccb25c40aebdc85a139104de4 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 11 Jun 2015 23:13:14 -0400 Subject: [PATCH 2/2] runtime fix --- code/modules/events/tgevents/anomaly_pyro.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/tgevents/anomaly_pyro.dm b/code/modules/events/tgevents/anomaly_pyro.dm index df4805121cd..29e2a1c1401 100644 --- a/code/modules/events/tgevents/anomaly_pyro.dm +++ b/code/modules/events/tgevents/anomaly_pyro.dm @@ -17,10 +17,10 @@ return if(IsMultiple(activeFor, 5)) newAnomaly.anomalyEffect() - + /datum/event/anomaly/anomaly_pyro/end() if(newAnomaly.loc) - explosion(get_turf(newAnomaly), -1,0,3, flame_range = 4) + explosion(get_turf(newAnomaly), -1,0,3) var/mob/living/carbon/slime/S = new/mob/living/carbon/slime(get_turf(newAnomaly)) S.colour = pick("red", "orange")