PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02:00

..

_DynamicAreaLighting_TG.dm

remove lighting area GC for now

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

autotransfer.dm

…

communications.dm

Removes references to the Syndicate and renames nuclear emergency mode.

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

configuration.dm

Makes the number of load/storable character slots a configurable value.

2014-10-14 10:05:22 +02: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 branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

shuttle_controller.dm

Removes references to the Syndicate and renames nuclear emergency mode.

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

verbs.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

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

voting.dm

Reduced vote alert noise by half, now easily editable by an arg

2014-09-30 09:28:51 -04:00