PsiOmega 7bb5b51954 Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event ...

Conflicts:
	code/modules/events/event_manager.dm

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

..

__HELPERS

Fixes and event end estimations.

2014-11-12 09:39:54 +01:00

_onclick

Completes the basic random event manager.

2014-11-08 18:22:31 +01:00

ATMOSPHERICS

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

controllers

Fixes and event end estimations.

2014-11-12 09:39:54 +01:00

datums

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

2014-11-07 09:42:53 +01:00

defines

Logging of event changes.

2014-11-10 16:19:51 +01:00

FEA

…

game

Fixes and event end estimations.

2014-11-12 09:39:54 +01:00

js

…

modules

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

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

TriDimension

Merge pull request #6275 from RavingManiac/dev

2014-09-09 17:54:53 +04:00

unused

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

WorkInProgress

Merge pull request #6958 from PsiOmegaDelta/TimeOfNews

2014-11-07 01:00:18 -05:00

ZAS

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

2014-10-15 22:13:44 +01:00

global.dm

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

2014-11-08 10:26:45 +01:00

hub.dm

…

names.dm

…

setup.dm

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

2014-10-29 19:17:35 +01:00

stylesheet.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

world.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

2014-10-15 10:05:50 +10:30