cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes anomaly events not triggering when invoking the apocalypse rune (#70726)

Browse Source 
`var/datum/round_event_control/anomaly/anomaly_flux/AF`
vars were never set to anything lol

🆑 ShizCalev
fix: Fixed anomalies not spawning when invoking the apocalypse rune
/🆑
This commit is contained in:
ShizCalev
2022-11-15 21:19:54 -05:00
committed by GitHub
parent 58b4b07ef0
commit 4bfaebb391
1 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
code/modules/antagonists/cult/runes.dm
View File

@@ -1012,44 +1012,53 @@ structure_check() searches for nearby cultist structures required for the invoca
var/outcome = rand(1,100) var/outcome = rand(1,100)
switch(outcome) switch(outcome)
if(1 to 10) if(1 to 10)
var/datum/round_event_control/disease_outbreak/D = new() var/datum/round_event_control/disease_outbreak/covid_2562_event = locate() in SSevents.control
var/datum/round_event_control/mice_migration/M = new() INVOKE_ASYNC(covid_2562_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
D.runEvent() var/datum/round_event_control/mice_migration/stuart_big_event = locate() in SSevents.control
M.runEvent() INVOKE_ASYNC(stuart_big_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(11 to 20) if(11 to 20)
var/datum/round_event_control/radiation_storm/RS = new() var/datum/round_event_control/radiation_storm/my_skin_feels_funny_event = locate() in SSevents.control
RS.runEvent() INVOKE_ASYNC(my_skin_feels_funny_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(21 to 30) if(21 to 30)
var/datum/round_event_control/brand_intelligence/BI = new() var/datum/round_event_control/brand_intelligence/product_placement_gone_rogue_event = locate() in SSevents.control
BI.runEvent() INVOKE_ASYNC(product_placement_gone_rogue_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(31 to 40) if(31 to 40)
var/datum/round_event_control/immovable_rod/R = new() var/datum/round_event_control/immovable_rod/huge_rod_event = locate() in SSevents.control //you've
R.runEvent() INVOKE_ASYNC(huge_rod_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) //got
R.runEvent() INVOKE_ASYNC(huge_rod_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) //a
R.runEvent() INVOKE_ASYNC(huge_rod_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)) //huge...
if(41 to 50) if(41 to 50)
var/datum/round_event_control/meteor_wave/MW = new() var/datum/round_event_control/meteor_wave/dinosaur_purge_event = locate() in SSevents.control
MW.runEvent() INVOKE_ASYNC(dinosaur_purge_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(51 to 60) if(51 to 60)
var/datum/round_event_control/spider_infestation/SI = new() var/datum/round_event_control/spider_infestation/creepy_crawly_event = locate() in SSevents.control
SI.runEvent() INVOKE_ASYNC(creepy_crawly_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(61 to 70) if(61 to 70)
var/datum/round_event_control/anomaly/anomaly_flux/AF var/datum/round_event_control/anomaly/anomaly_flux/flux_event = locate() in SSevents.control
var/datum/round_event_control/anomaly/anomaly_grav/AG INVOKE_ASYNC(flux_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
var/datum/round_event_control/anomaly/anomaly_pyro/AP var/datum/round_event_control/anomaly/anomaly_grav/grav_event = locate() in SSevents.control
var/datum/round_event_control/anomaly/anomaly_vortex/AV INVOKE_ASYNC(grav_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
AF.runEvent() var/datum/round_event_control/anomaly/anomaly_pyro/pyro_event = locate() in SSevents.control
AG.runEvent() INVOKE_ASYNC(pyro_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
AP.runEvent() var/datum/round_event_control/anomaly/anomaly_vortex/vortex_event = locate() in SSevents.control
AV.runEvent() INVOKE_ASYNC(vortex_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(71 to 80) if(71 to 80)
var/datum/round_event_control/spacevine/SV = new() var/datum/round_event_control/spacevine/ivy_event = locate() in SSevents.control
var/datum/round_event_control/grey_tide/GT = new() INVOKE_ASYNC(ivy_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
SV.runEvent() var/datum/round_event_control/grey_tide/grey_tide_nation_wide = locate() in SSevents.control
GT.runEvent() INVOKE_ASYNC(grey_tide_nation_wide, TYPE_PROC_REF(/datum/round_event_control, runEvent))
if(81 to 100) if(81 to 100)
var/datum/round_event_control/portal_storm_narsie/N = new() var/datum/round_event_control/portal_storm_narsie/total_not_a_xen_storm_event = locate() in SSevents.control
N.runEvent() INVOKE_ASYNC(total_not_a_xen_storm_event, TYPE_PROC_REF(/datum/round_event_control, runEvent))
qdel(src) qdel(src)
/obj/effect/rune/apocalypse/proc/image_handler(list/images, duration) /obj/effect/rune/apocalypse/proc/image_handler(list/images, duration)