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

Conflicts:
	code/modules/power/solar.dm

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

..

particle_accelerator

Updates emitters and containment field power usage

2014-08-10 00:40:58 -04:00

collector.dm

Merge branch 'dev' into PowerTwo

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

containment_field.dm

Updates emitters and containment field power usage

2014-08-10 00:40:58 -04:00

emitter.dm

Replaces add_load with draw_power. Issue about silly battery handling remains. Fixes the build-error.

2014-10-20 19:18:27 +02:00

field_generator.dm

Updates emitters and containment field power usage

2014-08-10 00:40:58 -04:00

generator.dm

Preparations for reducing the number of processing machines at round-start. There are currently 8000 or so at round start, this was already pruned to 2800ish by doohl's stuff.

2012-09-02 20:32:01 +00:00

investigate.dm

TG: Added a new logging system that can be used for various things in the game (such

2012-05-29 01:45:03 +01:00

singularity.dm

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00