PsiOmega 611a8113a6 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents ...

Conflicts:
	code/modules/events/radiation_storm.dm

2014-11-05 14:37:20 +01:00

..

alien_infestation.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

blob.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

borers.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

brand_intelligence.dm

More Z-level compatibility

2014-11-03 09:57:56 +01:00

carp_migration.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00

comms_blackout.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

communications_blackout.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

disease_outbreak.dm

More Z-level compatibility

2014-11-03 09:57:56 +01:00

electrical_storm.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

event_dynamic.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00

event_manager.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00

event.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00

grid_check.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

infestation.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

ion_storm.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

meteors.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

money_hacker.dm

moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)

2013-09-20 13:35:49 +10:00

money_lotto.dm

PDA newscaster

2014-10-28 17:10:35 +01:00

money_spam.dm

PDA newscaster

2014-10-28 17:10:35 +01:00

prison_break.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

radiation_storm.dm

Merge remote-tracking branch 'upstream/dev' into TheGreatEvents

2014-11-05 14:37:20 +01:00

rogue_drones.dm

More Z-level compatibility

2014-11-03 09:57:56 +01:00

space_ninja.dm

removed unused event files, added some new events from unused ones, restructured/tweaked some event procs

2013-02-10 21:12:40 +10:00

spacevine.dm

fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event

2013-02-14 23:17:54 +10:00

spider_infestation.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

spontaneous_appendicitis.dm

Fixed various medical events.

2013-05-26 23:21:08 +02:00

viral_infection.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00

viral_outbreak.dm

Fixed various medical events.

2013-05-26 23:21:08 +02:00

wallrot.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00