PsiOmega ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC ...

Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm

2014-11-16 10:38:01 +01:00

..

_DynamicAreaLighting_TG.dm

remove lighting area GC for now

2014-09-14 17:40:07 +01:00

autotransfer.dm

Fix for reported issue with the transfer_controller causing a runtime error. Also included is a debug controller for the transfer_controller

2013-11-21 17:44:31 -08:00

communications.dm

Service personnel get their own radio frequency

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

configuration.dm

Fixes and event end estimations.

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

emergency_shuttle_controller.dm

Announcement system refactoring.

2014-08-21 06:34:41 +02:00

failsafe.dm

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

hooks-defs.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

hooks.dm

Mutiny Mode

2014-05-11 15:03:50 -05:00

lighting_controller.dm

remove lighting area GC for now

2014-09-14 17:40:07 +01:00

master_controller.dm

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

2014-11-11 14:13:02 +01:00

shuttle_controller.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

verbs.dm

Random Event Overhaul

2014-11-03 09:22:37 +01:00

voting.dm

Fixes #6881

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