ComicIronic 57cf932a54 Merge conflicts.

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

..

areas.dm

cleaned up/added some missing icon_states for (rust) engineering areas

2013-03-05 16:51:09 +10:00

circuits_and_design.dm

some tweaks and balances to rust circuit research levels

2013-03-05 16:47:26 +10:00

core_control.dm

Combine a shitload of strings.

2013-09-04 13:17:54 -07:00

core_field.dm

GC fixes.

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

core_gen.dm

Fixed welding down machines.

2014-11-12 19:10:11 +00:00

core_monitor.dm

core gens start locked, added placeholder core monitor file

2013-03-06 01:29:48 +10:00

fuel_assembly_port_construction.dm

Merge conflicts.

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

fuel_assembly_port.dm

miscellaneous rusk tweaks and fixes including: resolved assembly sprite hiding under things, resolved compressor not producing assemblies with the right amount of matter, made injectors able to be rotated, removed cooldown from injector to port assembly swap, made ejected/created assemblies not appear in the middle of walls (being created from wall-mounted machinery),

2013-05-19 19:05:51 +10:00

fuel_assembly.dm

miscellaneous rusk tweaks and fixes including: resolved assembly sprite hiding under things, resolved compressor not producing assemblies with the right amount of matter, made injectors able to be rotated, removed cooldown from injector to port assembly swap, made ejected/created assemblies not appear in the middle of walls (being created from wall-mounted machinery),

2013-05-19 19:05:51 +10:00

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

Combine a shitload of strings.

2013-09-04 13:17:54 -07:00

fuel_injector.dm

Fixed welding down machines.

2014-11-12 19:10:11 +00:00

fusion_reactions.dm

rewrote fusion reactions to use datums instead of a switch statement (with reaction recipes stored in the master controller for debug editing), restructured fusion recipes to be more balanced + gameplay-centric, rewrote fusion reactions to use (mostly) fictional elements, miscellaneous fixes and cleanup

2013-05-19 19:08:57 +10:00

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

consolidated icons

2013-02-22 19:51:28 +10:00

rust.dmi

tweaked some rust icons

2013-03-05 16:22:35 +10:00

virtual_particle_catcher.dm

** WILL NOT COMPILE, OVER STRINGS LIMIT **

2013-09-03 23:19:24 -07:00