eswordthecat 6a40cc4215 Merge remote-tracking branch 'upstream/Bleeding-Edge' into patch-200

2015-01-15 04:44:26 +08:00

..

areas.dm

…

circuits_and_design.dm

…

core_control.dm

…

core_field.dm

GC fixes.

2014-02-16 12:37:06 -08:00

core_gen.dm

e65919da42

2015-01-12 15:42:50 +08:00

core_monitor.dm

…

fuel_assembly_port_construction.dm

Merge conflicts.

2015-01-07 16:38:06 +00:00

fuel_assembly_port.dm

…

fuel_assembly.dm

…

fuel_compressor_construction.dm

Merge conflicts.

2015-01-07 16:38:06 +00:00

fuel_compressor.dm

Added NanoUI from bay, hit string limit, ran string combiner again.

2013-09-24 19:46:45 -07:00

fuel_control.dm

…

fuel_injector.dm

e65919da42

2015-01-12 15:42:50 +08:00

fusion_reactions.dm

…

gyrotron_controller.dm

Added NanoUI from bay, hit string limit, ran string combiner again.

2013-09-24 19:46:45 -07:00

gyrotron.dm

Re-adding object pooling for beam projectiles. Fixed the double damage bug with a spawn().

2014-05-22 09:46:11 -05:00

radiation.dm

…

rust_old.dmi

…

rust.dmi

…

virtual_particle_catcher.dm

…