PsiOmega eee67109d1 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm

2015-04-23 13:15:43 +02:00

..

blob.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

brand_intelligence.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

carp_migration.dm

Randomizes carp spawning locations

2015-01-10 11:49:10 -05:00

comms_blackout.dm

Completes the transfer to the refreshed announcement system.

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

communications_blackout.dm

Cleans up announcement sound handling. Plays communication blackout sound at half volume.

2015-03-31 14:51:22 +02:00

disease_outbreak.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

dust.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

electrical_storm.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

event_container.dm

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

2015-04-03 09:33:05 +02:00

event_dynamic.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

event_manager.dm

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

2015-04-03 09:33:05 +02:00

event.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

gravity.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

grid_check.dm

Gridcheck event now only announces sometimes

2015-01-10 01:26:49 -05:00

infestation.dm

Area cleanup part 1: Engineering Department

2015-02-03 14:50:11 -08:00

ion_storm.dm

Multiple AIs no longer guaranteed to receive the same ion laws.

2015-03-03 15:40:39 +01:00

meteors.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

money_hacker.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

money_lotto.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

money_spam.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

prison_break.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

radiation_storm.dm

Preliminary work on converting all monkeys to a human subspecies.

2015-03-25 02:15:45 +10:30

random_antagonist.dm

Adds more events, misc event changes.

2015-03-31 13:07:27 +02:00

rogue_drones.dm

Drastically reduces radiation storm duration.

2014-12-11 10:36:15 +01:00

space_ninja.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

spacevine.dm

Collapsed space vines, glowshrooms and biomass into one spreading-plant system.

2015-02-04 10:49:41 +10:30

spider_infestation.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

spontaneous_appendicitis.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

viral_infection.dm

Change of random virus targets.

2015-04-22 12:27:28 +02:00

viral_outbreak.dm

…

wallrot.dm

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00