Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

alien_infestation.dm

…

blob.dm

Readjusts blob random event

2014-02-07 19:57:46 +01:00

borers.dm

Added cortical borer spawn event and admin verbs.

2013-12-18 14:25:38 +10:30

brand_intelligence.dm

Various

2014-01-11 22:22:24 +01:00

carp_migration.dm

…

comms_blackout.dm

…

communications_blackout.dm

…

disease_outbreak.dm

DNA2 Bug Fixes - Part 2

2014-02-06 23:07:35 -08:00

electrical_storm.dm

…

event_dynamic.dm

As far as I can tell, viral infections were happening irrespec

2014-06-26 20:59:30 +09:30

event_manager.dm

Event Rebalance!

2013-11-16 02:09:28 -05:00

event.dm

…

grid_check.dm

…

infestation.dm

Replaces the now non-existing "unused assembly line" with another area.

2014-05-01 13:33:58 +02:00

ion_storm.dm

Tweaks for spam #2

2014-05-29 16:05:00 +04:00

meteors.dm

…

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

Fix oversight of TC daily

2014-05-26 20:07:03 -07:00

money_spam.dm

Merge pull request #5086 from UristMcKerman/spam-filter

2014-06-01 20:09:06 +04:00

organ_failure.dm

Having an infection raises your body temperature

2014-06-21 16:55:07 -04:00

prison_break.dm

…

radiation_storm.dm

DNA2 fixes cherrypicked from N3X15.

2013-12-23 00:06:56 +10:30

rogue_drones.dm

…

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

…

spontaneous_appendicitis.dm

…

viral_infection.dm

…

viral_outbreak.dm

…

wallrot.dm

…