Cael_Aislinn eb02fb3636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	baystation12.dme
	code/modules/events/event_manager.dm
	code/modules/events/ion_storm.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-02-11 02:56:07 +10:00

..

alien_infestation.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

blob.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

brand_intelligence.dm

Increased the announceWhen for the brand intelligence event.

2013-01-11 18:46:24 +00:00

carp_migration.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

comms_blackout.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

communications_blackout.dm

Made the alien infestation event only create a command report if it successfully spawns an alien.

2013-01-12 18:05:41 +00:00

disease_outbreak.dm

Committing for Cael_Aislinn:

2013-01-12 16:44:06 +00:00

dynamic_events.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

electrical_storm.dm

Added a new events system!

2013-01-10 23:45:57 +00:00

event_manager.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-11 02:56:07 +10:00

event.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

grid_check.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

ion_storm.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

meteors.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

prison_break.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

radiation_storm.dm

Committing for Cael_Aislinn:

2013-01-12 16:44:06 +00: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

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

spider_infestation.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

spontaneous_appendicitis.dm

tweaked, reworked and restructured a bunch of events, fixed the capitalisations issue in my repo structure

2013-02-10 21:22:02 +10:00

viral_infection.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

viral_outbreak.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