PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

apc_damage.dm

…

blob.dm

…

brand_intelligence.dm

…

camera_damage.dm

…

carp_migration.dm

…

comms_blackout.dm

…

communications_blackout.dm

…

disease_outbreak.dm

…

dust.dm

…

electrical_storm.dm

…

event_container.dm

…

event_dynamic.dm

…

event_manager.dm

…

event.dm

…

gravity.dm

…

grid_check.dm

…

infestation.dm

…

ion_storm.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

meteors.dm

…

money_hacker.dm

…

money_lotto.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

money_spam.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

prison_break.dm

…

radiation_storm.dm

…

random_antagonist.dm

…

rogue_drones.dm

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

2015-08-11 08:21:06 +02:00

space_ninja.dm

…

spacevine.dm

…

spider_infestation.dm

…

spontaneous_appendicitis.dm

…

viral_infection.dm

…

viral_outbreak.dm

…

wallrot.dm

…